eventq_rabbitmq 1.10.4 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e56bd84cbee6f49b6dead60a68cb600092fa0e5
-  data.tar.gz: 7a08b8efdd47ead507c90649449a6599d095d224
+  metadata.gz: 4928cde9bcd0b762d3b0938c52592048b21f2a58
+  data.tar.gz: 42289c45561bc1f2258406ec33b07abadf8debb9
 SHA512:
-  metadata.gz: 20709f9bd6255ecb6c50cc74e71bef1bffdb4ce00ffc23655abf4d537aaa2827dc8413a226fd78bff6ed2f5d817cb208c806d5a06acd958dde21b1624fd79338
-  data.tar.gz: 86049fb088de5e4103aa8a80d5b5838f281305217e8497170d0d9204cd67d638a043bd6ad38b3ac99dc676a1830e549a7f22e282b46fb3bb9b3761c6e932d880
+  metadata.gz: 1aa81b43c8983ef50efc43426e1253f99410fd51433cfe5d8d4339296a5a0b24275760e8e385c85843e18a9b8c030fcce2775c2a4797aab89f7a61f9401c23f4
+  data.tar.gz: 245391ae31872971615166e6e9bc90bfcc3d5f0cbe63c2cf6437c55c236adbb24f04db0c0c771a2a5986ed24a3825ef964979ccc3025a946c0cf5505a4838fe2

data/lib/eventq_rabbitmq/rabbitmq_queue_worker.rb

@@ -11,6 +11,8 @@ module EventQ
         @is_running = false
 
         @retry_exceeded_block = nil
+        @on_retry_block = nil
+        @on_error_block = nil
         @hash_helper = HashKit::Helper.new
         @serialization_provider_manager = EventQ::SerializationProviders::Manager.new
         @last_gc_flush = Time.now
@@ -94,7 +96,16 @@ module EventQ
                 has_received_message = thread_process_iteration(channel, manager, queue, block)
 
               rescue => e
-                EventQ.logger.error "An unhandled error occurred attempting to communicate with RabbitMQ. Error: #{e} | Backtrace: #{e.backtrace}"
+                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
               end
 
               if channel != nil && channel.status != :closed
@@ -162,7 +173,16 @@ module EventQ
           end
 
         rescue => e
-          EventQ.log(:error, "[#{self.class}] - An error occurred attempting to pop a message from the queue. Error: #{e} | Backtrace: #{e.backtrace}")
+          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
         end
 
         return received
@@ -183,6 +203,16 @@ module EventQ
         return nil
       end
 
+      def on_retry(&block)
+        @on_retry_block = block
+        return nil
+      end
+
+      def on_error(&block)
+        @on_error_block = block
+        return nil
+      end
+
       def running?
         return @is_running
       end
@@ -197,7 +227,7 @@ module EventQ
         return provider.serialize(msg)
       end
 
-      def reject_message(channel, message, delivery_info, retry_exchange, queue)
+      def reject_message(channel, message, delivery_info, retry_exchange, queue, abort)
 
         EventQ.log(:info, "[#{self.class}] - Message rejected removing from queue.")
         #reject the message to remove from queue
@@ -210,7 +240,11 @@ module EventQ
 
           if @retry_exceeded_block != nil
             EventQ.log(:debug, "[#{self.class}] - Executing retry exceeded block.")
-            @retry_exceeded_block.call(message)
+            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
@@ -237,6 +271,15 @@ 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
+
         end
 
         return true
@@ -312,7 +355,7 @@ module EventQ
 
         if error || abort
           EventQ::NonceManager.failed(message.id)
-          reject_message(channel, message, delivery_info, retry_exchange, queue)
+          reject_message(channel, message, delivery_info, retry_exchange, queue, abort)
         else
           EventQ::NonceManager.complete(message.id)
         end

data/lib/eventq_rabbitmq/version.rb

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

metadata

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