eventq_rabbitmq 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61ce485e370a78cd9d450104b7083fcdbf6bf770
-  data.tar.gz: 2b3a282086892b4c512f0038e8c2ea9a1a2826e3
+  metadata.gz: 96c30cb1ae498d1150a5117aa1e64c05dd5570ad
+  data.tar.gz: 26ce2d3f2bac930f75222036615dd0fecf2ed6bc
 SHA512:
-  metadata.gz: e6c8908c68e95970ea62da7b63ddb6542fce81f526e002a73cdfc5d36703ee5e58c0d05bcff0734fa5f981679f3f3c667ce3734e27e2a27ef323a14e298bc03e
-  data.tar.gz: c7c592a4af075ebb275ca21210b6901f81c71bb4d7f5dcd0395620f91a30f9e8bd8b7785341908b32ec6b3413ec9e0506c4352c42af491865eb67aa1dfbcf5b9
+  metadata.gz: 86c1d737de716bb6a2ab5bd2fd97d098c97df2fa17f8c5c137248d21efd33173055bbdc36b0c1cf798e16186b3a677e5e33922757efbb9aab5c69de124ca64c1
+  data.tar.gz: 145c03a98b3cbac3804c3102002c0248ccc5bc2a6b9940af71bc760b41327627b4ff41672d6c55bec7e4b7aa4cb3593fa6ee8ccaf92fdbafd38ec12be2fe1f4a

data/lib/eventq_rabbitmq/rabbitmq_queue_worker.rb

@@ -128,42 +128,20 @@ module EventQ
 
         received = false
         error = false
-        abort = false
 
         begin
           delivery_info, properties, payload = q.pop(:manual_ack => true, :block => true)
 
           #check that message was received
           if payload != nil
-            tag_processing_thread
-
-            message = deserialize_message(payload)
-
-            EventQ.log(:debug, "[#{self.class}] - Message received. Retry Attempts: #{message.retry_attempts}")
-
-            message_args = EventQ::MessageArgs.new(message.type, message.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
-                channel.acknowledge(delivery_info.delivery_tag, false)
-                EventQ.log(:info, "[#{self.class}] - Message acknowledged.")
-                received = true
+              tag_processing_thread
+              process_message(payload, queue, channel, retry_exchange, delivery_info, block) do |received, error|
+                received = received
+                error = error
               end
-
-            rescue => e
-              EventQ.log(:error, "[#{self.class}] - An unhandled error happened attempting to process a queue message. Error: #{e} | Backtrace: #{e.backtrace}")
-              error = true
-            end
-
-            if error || abort
-              reject_message(channel, message, delivery_info, retry_exchange, queue)
+            ensure
+              untag_processing_thread
             end
 
           end
@@ -284,6 +262,41 @@ module EventQ
 
       end
 
+      private
+
+      def process_message(payload, queue, channel, retry_exchange, delivery_info, block)
+        abort = false
+        message = deserialize_message(payload)
+
+        EventQ.log(:debug, "[#{self.class}] - Message received. Retry Attempts: #{message.retry_attempts}")
+
+        message_args = EventQ::MessageArgs.new(message.type, message.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
+            channel.acknowledge(delivery_info.delivery_tag, false)
+            EventQ.log(:info, "[#{self.class}] - Message acknowledged.")
+            received = true
+          end
+
+        rescue => e
+          EventQ.log(:error, "[#{self.class}] - An unhandled error happened attempting to process a queue message. Error: #{e} | Backtrace: #{e.backtrace}")
+          error = true
+        end
+
+        if error || abort
+          reject_message(channel, message, delivery_info, retry_exchange, queue)
+        end
+
+        yield [received, error]
+      end
     end
   end
 end

data/lib/eventq_rabbitmq/version.rb

@@ -1,3 +1,3 @@
 module EventqRabbitmq
-  VERSION = "1.8.0"
+  VERSION = "1.8.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eventq_rabbitmq
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - vaughanbrittonsage