active_elastic_job 1.3.3 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b6ddee2978dadb7583fd3b80029db16237e9379
-  data.tar.gz: 221f7ad5ad3392531f2d58ec84471f9fe4c56650
+  metadata.gz: 2c8395a6c3ac158c58cf57615c9df6bbe847ea76
+  data.tar.gz: 33b4188334606d4df92dd4fff85e2fc6a5558629
 SHA512:
-  metadata.gz: 6eea93a2f8921038c6118be8f4d47ac64bd24562b07f101419b42c3e3d18fc62e268eab03cab883637ee6f130b581538436dc77a1760bff89edc0d7a754d6ce9
-  data.tar.gz: 5a28a30592122b6f16a68dce3c865ac217954fcabe3658770918ac1dea8e51d13684feb53ca305fadbca97524955bc104ca59483f5aeda584c50e3af0033fe17
+  metadata.gz: e53f0f7464e92f180bbd19af890a8069dbecafab7032865c4eb8f83052c7f01a3497c83383e023c996097875c4208fb70b1274e83e868fb80d50257eaeb53390
+  data.tar.gz: 44fab25e6c687772f19b01816ee56f94ccefc06e517a541b5aad1363f9a72f289d6a65713f5e663d89a7dda86844d070ca5ad8e4c3f0670b93102b5760958e17

data/lib/active_elastic_job/rack/sqs_message_consumer.rb

@@ -26,15 +26,19 @@ module ActiveElasticJob
 
       def call(env) #:nodoc:
         request = ActionDispatch::Request.new env
-        if aws_sqsd?(request) && originates_from_gem?(request)
+        if enabled? && aws_sqsd?(request) && originates_from_gem?(request)
+          unless request.local?
+            m = "Accepts only requests from localhost for job processing".freeze
+            return ['403', {CONTENT_TYPE_HEADER_NAME => 'text/plain' }, [ m ]]
+          end
           begin
             verify!(request)
             job = JSON.load(request.body)
             ActiveJob::Base.execute(job)
           rescue ActiveElasticJob::MessageVerifier::InvalidDigest => e
-            return ['403', {CONTENT_TYPE_HEADER_NAME => env['text/plain'] }, ["incorrect digest"]]
+            return ['403', {CONTENT_TYPE_HEADER_NAME => 'text/plain' }, ["incorrect digest"]]
           rescue StandardError => e
-            return ['500', {CONTENT_TYPE_HEADER_NAME => env['text/plain'] }, [e.message]]
+            return ['500', {CONTENT_TYPE_HEADER_NAME => 'text/plain' }, [e.message]]
           end
           return [OK_RESPONSE_CODE , {CONTENT_TYPE_HEADER_NAME => CONTENT_TYPE }, [ '' ]]
         end
@@ -43,6 +47,11 @@ module ActiveElasticJob
 
       private
 
+      def enabled?
+        var = ENV['DISABLE_SQS_CONSUMER'.freeze]
+        var == nil || var == 'false'.freeze
+      end
+
       def verify!(request)
         secret_key_base = Rails.application.secrets[:secret_key_base]
         @verifier ||= ActiveElasticJob::MessageVerifier.new(secret_key_base)

data/lib/active_elastic_job/version.rb

@@ -1,8 +1,8 @@
 module ActiveElasticJob
   module VERSION
     MAJOR = 1
-    MINOR = 3
-    TINY  = 3
+    MINOR = 4
+    TINY  = 0
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/lib/active_job/queue_adapters/active_elastic_job_adapter.rb

@@ -15,6 +15,7 @@ module ActiveJob
     #   Rails.application.config.active_job.queue_adapter = :active_elastic_job
     class ActiveElasticJobAdapter
       MAX_MESSAGE_SIZE = (256 * 1024)
+      MAX_DELAY_IN_MINUTES = 15
 
       extend ActiveElasticJob::MD5MessageDigestCalculation
 
@@ -126,15 +127,14 @@ The message with Message ID #{message_id} sent to SQS might be corrupted.
 
         def calculate_delay(timestamp)
           delay = (timestamp - Time.current.to_f).to_i + 1
-          if delay > 15.minutes
+          if delay > MAX_DELAY_IN_MINUTES.minutes
             msg =<<-MSG
-Jobs cannot be scheduled more than 15 minutes into the future.
+Jobs cannot be scheduled more than #{MAX_DELAY_IN_MINUTES} minutes into the future.
 See http://docs.aws.amazon.com/AWSSimpleQueueService/latest/APIReference/API_SendMessage.html
 for further details!
             MSG
-            raise RangeError, msg if delay > 15.minutes
+            raise RangeError
           end
-          delay = 0 if delay < 0
           delay
         end
 
@@ -145,7 +145,7 @@ for further details!
         end
 
         def aws_sqs_client
-          Aws::SQS::Client.new(
+          @aws_sqs_client ||= Aws::SQS::Client.new(
             access_key_id: ENV['AWS_ACCESS_KEY_ID'],
             secret_access_key: ENV['AWS_SECRET_ACCESS_KEY'],
             region: ENV['AWS_REGION']
@@ -154,8 +154,8 @@ for further details!
 
         def message_digest(messsage_body)
           secret_key_base = Rails.application.secrets[:secret_key_base]
-          verifier = ActiveElasticJob::MessageVerifier.new(secret_key_base)
-          verifier.generate_digest(messsage_body)
+          @verifier ||= ActiveElasticJob::MessageVerifier.new(secret_key_base)
+          @verifier.generate_digest(messsage_body)
         end
 
         def verify_md5_digests!(response, messsage_body, message_attributes = nil)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_elastic_job
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.4.0
 platform: ruby
 authors:
 - Tawan Sierek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-14 00:00:00.000000000 Z
+date: 2016-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk