eventq_aws 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddd9f355da04624bfac3223f7acfd908796ca09f
-  data.tar.gz: 9b80129253f34372f5cddbb4ac4aebaaeac8f813
+  metadata.gz: 960bc855dcdbb80c29b612240a61e8d33507a3d7
+  data.tar.gz: bcca57f08e3a82674474b998c0f0afa3d4efc96d
 SHA512:
-  metadata.gz: 43784c0584439c4e11934d347176197fda3873c1733aac74c06ecf6885d6266cb1e6bcf933e1de3ad6c300a6a74956221415ee4ea331709e6bec2840b300a9fa
-  data.tar.gz: f13a8e3960119417c5bc98f23da956cf878dc32048b44d019b2fa8c8d6abe6ec72dd012f76526d2519a91f23b10efb957e8056762b155c1c9a462e61aecdc026
+  metadata.gz: 4306b1e8c531dc08e06471c7cd4bc88a01d37647a2649f33fe42933742838bccdd50120368c1cfd2b362ae06f5c1525f830c74c2dd0fc8bcf7f8e2ddaf763a2e
+  data.tar.gz: e38f600b473eb503a4557a169ebc87c914404aa38f11b6f410bf0e94449d15d00bec2c9fd848c0f0793bbaf93a7b1ddab202ef3863ca2bd9a286304973e58a6a

data/lib/eventq_aws/aws_queue_worker.rb

@@ -102,7 +102,6 @@ module EventQ
 
         received = false
         error = false
-        abort = false
 
         begin
 
@@ -116,44 +115,14 @@ module EventQ
 
           #check that a message was received
           if response.messages.length > 0
-            tag_processing_thread
-
-            msg = response.messages[0]
-            retry_attempts = msg.attributes[APPROXIMATE_RECEIVE_COUNT].to_i - 1
-
-            #deserialize the message payload
-            payload = JSON.load(msg.body)
-            message = deserialize_message(payload[MESSAGE])
-
-            message_args = EventQ::MessageArgs.new(message.type, retry_attempts)
-
-            EventQ.log(:debug, "[#{self.class}] - Message received. Retry Attempts: #{retry_attempts}")
-
-            #begin worker block for queue message
             begin
-
-              block.call(message.content, message_args)
-
-              if message_args.abort == true
-                abort = true
-                EventQ.log(:info, "[#{self.class}] - Message aborted.")
-              else
-                #accept the message as processed
-                client.sqs.delete_message({ queue_url: q, receipt_handle: msg.receipt_handle })
-                EventQ.log(:info, "[#{self.class}] - Message acknowledged.")
-                received = true
+              tag_processing_thread
+              process_message(response, client, queue, q, block) do |received, error|
+                received = received
+                error = error
               end
-
-            rescue => e
-              EventQ.log(:error, "[#{self.class}] - An unhandled error happened while attempting to process a queue message. Error: #{e} | Backtrace: #{e.backtrace}")
-
-              error = true
-
-            end
-
-            if abort || error
-              EventQ.log(:info, "[#{self.class}] - Message rejected.")
-              reject_message(queue, client, msg, q, retry_attempts)
+            ensure
+              untag_processing_thread
             end
 
           end
@@ -194,6 +163,49 @@ module EventQ
 
       private
 
+      def process_message(response, client, queue, q, block)
+        abort = false
+        msg = response.messages[0]
+        retry_attempts = msg.attributes[APPROXIMATE_RECEIVE_COUNT].to_i - 1
+
+        #deserialize the message payload
+        payload = JSON.load(msg.body)
+        message = deserialize_message(payload[MESSAGE])
+
+        message_args = EventQ::MessageArgs.new(message.type, retry_attempts)
+
+        EventQ.log(:debug, "[#{self.class}] - Message received. Retry Attempts: #{retry_attempts}")
+
+        #begin worker block for queue message
+        begin
+
+          block.call(message.content, message_args)
+
+          if message_args.abort == true
+            abort = true
+            EventQ.log(:info, "[#{self.class}] - Message aborted.")
+          else
+            #accept the message as processed
+            client.sqs.delete_message({ queue_url: q, receipt_handle: msg.receipt_handle })
+            EventQ.log(:info, "[#{self.class}] - Message acknowledged.")
+            received = true
+          end
+
+        rescue => e
+          EventQ.log(:error, "[#{self.class}] - An unhandled error happened while attempting to process a queue message. Error: #{e} | Backtrace: #{e.backtrace}")
+
+          error = true
+
+        end
+
+        if abort || error
+          EventQ.log(:info, "[#{self.class}] - Message rejected.")
+          reject_message(queue, client, msg, q, retry_attempts)
+        end
+
+        yield [received, error]
+      end
+
       def reject_message(queue, client, msg, q, retry_attempts)
 
         if !queue.allow_retry || retry_attempts >= queue.max_retry_attempts

data/lib/eventq_aws/version.rb

@@ -1,5 +1,5 @@
 module EventQ
   module Amazon
-    VERSION = "1.4.0"
+    VERSION = "1.4.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eventq_aws
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - vaughanbrittonsage