eventq_aws 0.4.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7039aff7eed4a4842ed95ada249d8cc616b3efa5
-  data.tar.gz: 4b9bb9168911dc4ce3a21490a332181299101de5
+  metadata.gz: 3f59d43ccd53c473e52953c7c9148c2dc0b53e8d
+  data.tar.gz: e3c52d01f9d13f3187aa564a3ebd26b0688b38de
 SHA512:
-  metadata.gz: c4607ac871cfac8658cbb263cfbf3a943fc680cb0d87e4eb145a938195105f13dd285d548fc56a2844fa93be1e4fc5510ea3b638339d8840d1966de8568ab48a
-  data.tar.gz: 55d5ba87b7bc20acb29dc408cd0c3d2be134186750d66dc392ab99aa7a57177ecbef5debb023a92578d39a7e9940e5174ed720be4f09fed2f8a702aea64b5874
+  metadata.gz: c14d414adb62321ed87a14870d12d2018bfab6b9c51b39aee771d1e5fbacc03cbc09653de84a3748b4f37cd0735217ab0960d6885c18e63f877047605a8a3d80
+  data.tar.gz: 52075f013c6ddeff487e606089dd3fd3f1caac01fbe7b40a1a37a3ce753b6fc4b233b35e20c9d35ab402e954b2379d836257e5c42e8207122952968d8adb18d6

data/lib/eventq_aws/aws_eventq_client.rb

@@ -28,7 +28,7 @@ module EventQ
                                            subject: event_type
                                        })
 
-        EventQ.logger.debug "[EVENTQ_AWS] - Raised event. Message: #{message} | Type: #{event_type}."
+        EventQ.log(:debug, "[#{self.class}] - Raised event. Message: #{message} | Type: #{event_type}.")
 
         return response.message_id
 

data/lib/eventq_aws/aws_queue_manager.rb

@@ -27,7 +27,7 @@ module EventQ
         response = @client.sqs.create_queue({
                                                 queue_name: queue.name,
                                                 attributes: {
-                                                    'VisibilityTimeout' => (queue.retry_delay / 1000).to_s
+                                                    'VisibilityTimeout' => 300.to_s #5 minutes
                                                 }
                                             })
 
@@ -60,7 +60,7 @@ module EventQ
         @client.sqs.set_queue_attributes({
                                              queue_url: url, # required
                                               attributes: {
-                                                'VisibilityTimeout' => (queue.retry_delay / 1000).to_s
+                                                'VisibilityTimeout' => 300.to_s
                                               }
                                           })
         return url

data/lib/eventq_aws/aws_queue_worker.rb

@@ -13,7 +13,7 @@ module EventQ
 
       def start(queue, options = {}, &block)
 
-        EventQ.logger.debug '[EVENTQ_AWS::QUEUE_WORKER] - Preparing to start listening for messages.'
+        EventQ.log(:info, "[#{self.class}] - Preparing to start listening for messages.")
 
         configure(queue, options)
 
@@ -23,7 +23,7 @@ module EventQ
 
         raise 'Worker is already running.' if running?
 
-        EventQ.logger.debug '[EVENTQ_AWS::QUEUE_WORKER] - Listening for messages.'
+        EventQ.log(:info, "[#{self.class}] - Listening for messages.")
 
         @is_running = true
         @threads = []
@@ -72,7 +72,7 @@ module EventQ
 
                   message_args = EventQ::MessageArgs.new(payload.type, retry_attempts)
 
-                  EventQ.logger.debug "[EVENTQ_AWS::QUEUE_WORKER] - Message received. Retry Attempts: #{retry_attempts}"
+                  EventQ.log(:debug, "[#{self.class}] - Message received. Retry Attempts: #{retry_attempts}")
 
                   #begin worker block for queue message
                   begin
@@ -81,35 +81,35 @@ module EventQ
 
                     if message_args.abort == true
                       abort = true
-                      EventQ.logger.debug '[EVENTQ_AWS::QUEUE_WORKER] - Message aborted.'
+                      EventQ.log(:debug, "[#{self.class}] - Message aborted.")
                     else
                       #accept the message as processed
                       client.sqs.delete_message({ queue_url: q, receipt_handle: msg.receipt_handle })
-                      EventQ.logger.debug '[EVENTQ_AWS::QUEUE_WORKER] - Message acknowledged.'
+                      EventQ.log(:debug, "[#{self.class}] - Message acknowledged.")
                       received = true
                     end
 
                   rescue => e
-                    EventQ.logger.debug "[EVENTQ_AWS::QUEUE_WORKER] - An unhandled error happened while attempting to process a queue message. Error: #{e}"
+                    EventQ.log(:error, "[#{self.class}] - An unhandled error happened while attempting to process a queue message. Error: #{e}")
 
                     error = true
 
                   end
 
                   if abort || error
-                    EventQ.logger.debug '[EVENTQ_AWS::QUEUE_WORKER] - Message rejected.'
+                    EventQ.log(:debug, "[#{self.class}] - Message rejected.")
                     reject_message(queue, client, msg, q, retry_attempts)
                   end
 
                 end
 
               rescue => e
-                EventQ.logger.error "[EVENTQ_AWS::QUEUE_WORKER] - An error occured attempting to retrieve a message from the queue. Error: #{e}"
+                EventQ.log(:error, "[#{self.class}] - An error occurred attempting to retrieve a message from the queue. Error: #{e}")
               end
 
               #check if any message was received
               if !received && !error
-                EventQ.logger.error "[EVENTQ_AWS::QUEUE_WORKER] - No message received. Sleeping for #{@sleep} seconds"
+                EventQ.log(:debug, "[#{self.class}] - No message received. Sleeping for #{@sleep} seconds")
                 #no message received so sleep before attempting to pop another message from the queue
                 sleep(@sleep)
               end
@@ -129,7 +129,7 @@ module EventQ
       end
 
       def stop
-        EventQ.logger.debug '[EVENTQ_AWS::QUEUE_WORKER] - Stopping.'
+        EventQ.log(:info, "[#{self.class}] - Stopping.")
         @is_running = false
         @threads.each { |thr| thr.join }
         return true
@@ -146,16 +146,52 @@ module EventQ
       private
 
       def reject_message(queue, client, msg, q, retry_attempts)
+
         if !queue.allow_retry || retry_attempts >= queue.max_retry_attempts
           #remove the message from the queue so that it does not get retried again
           client.sqs.delete_message({ queue_url: q, receipt_handle: msg.receipt_handle })
 
-          if retry_attempts >= queue.max_retry_attempts && @retry_exceeded_block != nil
-             EventQ.logger.debug '[EVENTQ_AWS::QUEUE_WORKER] - Executing retry exceeded block.'
-             @retry_exceeded_block.call(message)
+          if retry_attempts >= queue.max_retry_attempts
+
+            EventQ.log(:debug, "[#{self.class}] - Message retry attempt limit exceeded.")
+
+            if @retry_exceeded_block != nil
+              EventQ.log(:debug, "[#{self.class}] - Executing retry exceeded block.")
+              @retry_exceeded_block.call(message)
+            end
+
+          end
+
+        elsif queue.allow_retry
+
+          retry_attempts += 1
+
+          if queue.allow_retry_back_off == true
+            EventQ.log(:debug, "[#{self.class}] - Calculating message back off retry delay. Attempts: #{retry_attempts} * Delay: #{queue.retry_delay}")
+            visibility_timeout = (queue.retry_delay * retry_attempts) / 1000
+            if visibility_timeout > (queue.max_retry_delay / 1000)
+              EventQ.log(:debug, "[#{self.class}] - Max message back off retry delay reached.")
+              visibility_timeout = queue.max_retry_delay / 1000
+            end
+          else
+            EventQ.log(:debug, "[#{self.class}] - Setting fixed retry delay for message.")
+            visibility_timeout = queue.retry_delay / 1000
           end
 
+          if visibility_timeout > 43200
+            EventQ.log(:debug, "[#{self.class}] - AWS max visibility timeout of 12 hours has been exceeded. Setting message retry delay to 12 hours.")
+            visibility_timeout = 43200
+          end
+
+          EventQ.log(:debug, "[#{self.class}] - Sending message for retry. Message TTL: #{visibility_timeout}")
+          client.sqs.change_message_visibility({
+                                               queue_url: q, # required
+                                               receipt_handle: msg.receipt_handle, # required
+                                               visibility_timeout: visibility_timeout.to_s, # required
+                                           })
+
         end
+
       end
 
       def configure(queue, options = {})
@@ -174,7 +210,7 @@ module EventQ
           @sleep = options[:sleep]
         end
 
-        EventQ.logger.debug "[EVENTQ_AWS::QUEUE_WORKER] - Configuring. Thread Count: #{@thread_count} | Interval Sleep: #{@sleep}."
+        EventQ.log(:info, "[#{self.class}] - Configuring. Thread Count: #{@thread_count} | Interval Sleep: #{@sleep}.")
 
         return true
 

data/lib/eventq_aws/version.rb

@@ -1,5 +1,5 @@
 module EventQ
   module Amazon
-    VERSION = "0.4.0"
+    VERSION = "1.0.0"
   end
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: eventq_aws
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 1.0.0
 platform: ruby
 authors:
 - vaughanbrittonsage
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-18 00:00:00.000000000 Z
+date: 2016-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -84,28 +84,28 @@ dependencies:
   name: aws-sdk-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: eventq_base
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: This is the aws implementation for EventQ
@@ -117,13 +117,13 @@ extra_rdoc_files: []
 files:
 - bin/console
 - bin/setup
-- lib/eventq_aws.rb
 - lib/eventq_aws/aws_eventq_client.rb
 - lib/eventq_aws/aws_queue_client.rb
 - lib/eventq_aws/aws_queue_manager.rb
 - lib/eventq_aws/aws_queue_worker.rb
 - lib/eventq_aws/aws_subscription_manager.rb
 - lib/eventq_aws/version.rb
+- lib/eventq_aws.rb
 homepage: https://github.com/vaughanbrittonsage/eventq
 licenses:
 - MIT
@@ -134,17 +134,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: This is the aws implementation for EventQ