eventq_aws 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 346fa33d554dd48140b9c995e5baec9e675cd402
-  data.tar.gz: c720dead3d863d56f8c9fbeb88fedf8ee07ed6ff
+  metadata.gz: 2b91bac236d9fadad9db4453078324122c2ba608
+  data.tar.gz: b91670be1b67c306f5952089117ace9750086df1
 SHA512:
-  metadata.gz: 2003e4317ea719c16915dcbccd177736e564580de045aa58ff4c9332eed52220a3b3656e234c5bfa06c1c24fff94214a15a4fb084c163813f60c5789eaf6e021
-  data.tar.gz: 7e34f363b0e351183c092b3f189fd96039899f6ac747cac21af83e174d9d1921e3b7f12bb599b4f3ed6c5cc06e29c8b7999ef1c3496185337fc804c9ad06c78d
+  metadata.gz: a8689e523b8ac293a096efc1425347c05c7480071c45ec634070f4dacc3d808f891f2dde2807b2797a599d5a4933b973ce8d5bdf20f7c8e91717f731503101ac
+  data.tar.gz: 0829664e11a2b1239d491f3145e1bfbe55a0a47e539bd4fc1c55d83b6172905eef9518cf7a6d69043f672a85f0cb8a2af146b99726c123de06502e7102543455

data/lib/eventq_aws/aws_queue_worker.rb

@@ -13,7 +13,7 @@ module EventQ
         @forks = []
         @is_running = false
 
-        @retry_exceeded_block = nil
+        @on_retry_exceeded_block = nil
         @on_retry_block = nil
         @on_error_block = nil
 
@@ -154,18 +154,49 @@ module EventQ
 
         rescue => e
           EventQ.log(:error, "[#{self.class}] - An unhandled error occurred. Error: #{e} | Backtrace: #{e.backtrace}")
+          call_on_error_block(error: e)
+        end
 
-          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
+        return received
+      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
 
-        return received
+      def call_on_retry_exceeded_block(message)
+        if @on_retry_exceeded_block != nil
+          EventQ.log(:debug, "[#{self.class}] - Executing on_retry_exceeded block.")
+          begin
+            @on_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 stop
@@ -238,9 +269,8 @@ module EventQ
 
         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
-
+          call_on_error_block(error: e, message: message)
         end
 
         if message_args.abort || error
@@ -265,15 +295,7 @@ module EventQ
           if retry_attempts >= queue.max_retry_attempts
 
             EventQ.log(:info, "[#{self.class}] - Message retry attempt limit exceeded.")
-
-            if @retry_exceeded_block != nil
-              EventQ.log(:info, "[#{self.class}] - Executing retry exceeded block.")
-              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
+            call_on_retry_exceeded_block(message)
 
           end
 
@@ -307,14 +329,7 @@ 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
+          call_on_retry_block(message)
 
         end
 

data/lib/eventq_aws/version.rb

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

metadata

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