eventq_aws 1.6.4 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03fe17fdd0af8f2a61823abb1d83b534059e3287
-  data.tar.gz: 5cd347facb1f62b5e75055fe6e8f2d5588372327
+  metadata.gz: 346fa33d554dd48140b9c995e5baec9e675cd402
+  data.tar.gz: c720dead3d863d56f8c9fbeb88fedf8ee07ed6ff
 SHA512:
-  metadata.gz: 2478f7e0edfdda90f0b9f0755c06dfa23591675046ef5edc0c3ec164bf7bf71d04429f238bcfac73e9eb51e61fed313d78a05cf26490f4dbbb1adc18e90933f5
-  data.tar.gz: e52a354376e24079d87799ca9c5a9b8b9edf15a6406d0291b8f2b3ce9e92bc90884496bca2638a135a9596588fd93ac61fbd709c6c86589cc437135c523b57b5
+  metadata.gz: 2003e4317ea719c16915dcbccd177736e564580de045aa58ff4c9332eed52220a3b3656e234c5bfa06c1c24fff94214a15a4fb084c163813f60c5789eaf6e021
+  data.tar.gz: 7e34f363b0e351183c092b3f189fd96039899f6ac747cac21af83e174d9d1921e3b7f12bb599b4f3ed6c5cc06e29c8b7999ef1c3496185337fc804c9ad06c78d

data/lib/eventq_aws/aws_queue_worker.rb

@@ -14,6 +14,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
@@ -151,7 +153,16 @@ module EventQ
           end
 
         rescue => e
-          EventQ.log(:error, "[#{self.class}] - An error occurred attempting to retrieve a message from the queue. Error: #{e.backtrace}")
+          EventQ.log(:error, "[#{self.class}] - 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
 
         return received
@@ -168,6 +179,16 @@ module EventQ
         @retry_exceeded_block = block
       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
@@ -224,7 +245,7 @@ module EventQ
 
         if message_args.abort || error
           EventQ::NonceManager.failed(message.id)
-          reject_message(queue, client, msg, q, retry_attempts)
+          reject_message(queue, client, msg, q, retry_attempts, message, message_args.abort)
         else
           EventQ::NonceManager.complete(message.id)
         end
@@ -232,11 +253,11 @@ module EventQ
         return true
       end
 
-      def reject_message(queue, client, msg, q, retry_attempts)
+      def reject_message(queue, client, msg, q, retry_attempts, message, abort)
 
         if !queue.allow_retry || retry_attempts >= queue.max_retry_attempts
 
-          EventQ.log(:info, "[#{self.class}] - Message rejected removing from queue. Msg: #{serialize_message(msg)}")
+          EventQ.log(:info, "[#{self.class}] - Message rejected removing from queue. Message: #{serialize_message(message)}")
 
           #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 })
@@ -247,7 +268,11 @@ module EventQ
 
             if @retry_exceeded_block != nil
               EventQ.log(:info, "[#{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 on retry block. Error: #{e}")
+              end
             end
 
           end
@@ -282,6 +307,15 @@ module EventQ
                                                visibility_timeout: visibility_timeout.to_s, # required
                                            })
 
+          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
 
       end

data/lib/eventq_aws/version.rb

@@ -1,5 +1,5 @@
 module EventQ
   module Amazon
-    VERSION = "1.6.4"
+    VERSION = "1.7.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eventq_aws
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 1.7.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