eventq_rabbitmq 1.11.0 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4928cde9bcd0b762d3b0938c52592048b21f2a58
-  data.tar.gz: 42289c45561bc1f2258406ec33b07abadf8debb9
+  metadata.gz: 4d1f84071939202d7a6487fcac81399d9a473193
+  data.tar.gz: 72703a401e25627d44f2ef01bfe1411f2a3993a8
 SHA512:
-  metadata.gz: 1aa81b43c8983ef50efc43426e1253f99410fd51433cfe5d8d4339296a5a0b24275760e8e385c85843e18a9b8c030fcce2775c2a4797aab89f7a61f9401c23f4
-  data.tar.gz: 245391ae31872971615166e6e9bc90bfcc3d5f0cbe63c2cf6437c55c236adbb24f04db0c0c771a2a5986ed24a3825ef964979ccc3025a946c0cf5505a4838fe2
+  metadata.gz: 907d582a7afc9015386f885d6ac0f290b6a903c0da1326bbbe9bcc0fb6214be9ef48792ab563a521161288f02aba7822de28fa922088b8b79860f1ffbd3af63d
+  data.tar.gz: 81cdf1ac8d763aec08ce75f37b36dda8c08eff70a7ce34b2bd8fff559c3c55802facf2403a8c3f875735ccf4647e84173e33dffe1f2b74e299bf537c59edc76c

data/lib/eventq_rabbitmq/rabbitmq_queue_worker.rb

@@ -96,16 +96,8 @@ module EventQ
                 has_received_message = thread_process_iteration(channel, manager, queue, block)
 
               rescue => e
-                EventQ.logger.error "An unhandled error occurred. Error: #{e} | Backtrace: #{e.backtrace}"
-
-                if @on_error_block
-                  EventQ.log(:debug, "[#{self.class}] - Executing on error block.")
-                  begin
-                    @on_error_block.call(e, message)
-                  rescue => e2
-                    EventQ.log(:error, "[#{self.class}] - An error occurred executing the on error block. Error: #{e2}")
-                  end
-                end
+                EventQ.log(:error, "An unhandled error occurred. Error: #{e} | Backtrace: #{e.backtrace}")
+                call_on_error_block(error: e)
               end
 
               if channel != nil && channel.status != :closed
@@ -138,6 +130,19 @@ module EventQ
 
       end
 
+      def call_on_error_block(error:, message: nil)
+        if @on_error_block
+          EventQ.log(:debug, "[#{self.class}] - Executing on_error block.")
+          begin
+            @on_error_block.call(error, message)
+          rescue => e
+            EventQ.log(:error, "[#{self.class}] - An error occurred executing the on_error block. Error: #{e}")
+          end
+        else
+          EventQ.log(:debug, "[#{self.class}] - No on_error block specified to execute.")
+        end
+      end
+
       def gc_flush
         if Time.now - last_gc_flush > @gc_flush_interval
           GC.start
@@ -174,15 +179,7 @@ module EventQ
 
         rescue => e
           EventQ.log(:error, "[#{self.class}] - An error occurred attempting to process a message. Error: #{e} | Backtrace: #{e.backtrace}")
-
-          if @on_error_block
-            EventQ.log(:debug, "[#{self.class}] - Executing on error block.")
-            begin
-              @on_error_block.call(e)
-            rescue => e2
-              EventQ.log(:error, "[#{self.class}] - An error occurred executing the on error block. Error: #{e2}")
-            end
-          end
+          call_on_error_block(error: e)
         end
 
         return received
@@ -227,6 +224,32 @@ module EventQ
         return provider.serialize(msg)
       end
 
+      def call_on_retry_exceeded_block(message)
+        if @retry_exceeded_block != nil
+          EventQ.log(:debug, "[#{self.class}] - Executing on_retry_exceeded block.")
+          begin
+            @retry_exceeded_block.call(message)
+          rescue => e
+            EventQ.log(:error, "[#{self.class}] - An error occurred executing the on_retry_exceeded block. Error: #{e}")
+          end
+        else
+          EventQ.log(:debug, "[#{self.class}] - No on_retry_exceeded block specified.")
+        end
+      end
+
+      def call_on_retry_block(message)
+        if @on_retry_block
+          EventQ.log(:debug, "[#{self.class}] - Executing on_retry block.")
+          begin
+            @on_retry_block.call(message, abort)
+          rescue => e
+            EventQ.log(:error, "[#{self.class}] - An error occurred executing the on_retry block. Error: #{e}")
+          end
+        else
+          EventQ.log(:debug, "[#{self.class}] - No on_retry block specified.")
+        end
+      end
+
       def reject_message(channel, message, delivery_info, retry_exchange, queue, abort)
 
         EventQ.log(:info, "[#{self.class}] - Message rejected removing from queue.")
@@ -238,16 +261,7 @@ module EventQ
 
           EventQ.log(:info, "[#{self.class}] - Message retry attempt limit exceeded. Msg: #{serialize_message(message)}")
 
-          if @retry_exceeded_block != nil
-            EventQ.log(:debug, "[#{self.class}] - Executing retry exceeded block.")
-            begin
-              @retry_exceeded_block.call(message)
-            rescue => e
-              EventQ.log(:error, "[#{self.class}] - An error occurred executing the retry exceeded block. Error: #{e}")
-            end
-          else
-            EventQ.log(:debug, "[#{self.class}] - No retry exceeded block specified.")
-          end
+          call_on_retry_exceeded_block(message)
 
         #check if the message is allowed to be retried
         elsif queue.allow_retry
@@ -271,14 +285,7 @@ module EventQ
           retry_exchange.publish(serialize_message(message), :expiration => message_ttl)
           EventQ.log(:debug, "[#{self.class}] - Published message to retry exchange.")
 
-          if @on_retry_block
-            EventQ.log(:debug, "[#{self.class}] - Executing on retry block.")
-            begin
-              @on_retry_block.call(message, abort)
-            rescue => e
-              EventQ.log(:error, "[#{self.class}] - An error occurred executing the on retry block. Error: #{e}")
-            end
-          end
+          call_on_retry_block(message)
 
         end
 
@@ -351,6 +358,7 @@ module EventQ
         rescue => e
           EventQ.log(:error, "[#{self.class}] - An unhandled error happened attempting to process a queue message. Error: #{e} | Backtrace: #{e.backtrace}")
           error = true
+          call_on_error_block(error: e, message: message)
         end
 
         if error || abort

data/lib/eventq_rabbitmq/version.rb

@@ -1,3 +1,3 @@
 module EventqRabbitmq
-  VERSION = "1.11.0"
+  VERSION = "1.11.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eventq_rabbitmq
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.11.1
 platform: ruby
 authors:
 - vaughanbrittonsage
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-08 00:00:00.000000000 Z
+date: 2016-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler