sidekiq-amigo 1.13.1 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c75430ea4c493cfee46c6de0daf1e64b8a6bea0e17017524dc2bc540bf7f30b2
-  data.tar.gz: 3bd32447b4f3d52f3512570bb3af6d5cab2643619bc83c9e95c17c0fa66418a3
+  metadata.gz: 07551fc97532f4e4e819cb1f027b406df1c3144e98984cde26e90893420cf8fa
+  data.tar.gz: 67f0eb863e5d471897bc5c418c6ce8bdc4d118b54a6e135b32a97806159b91e6
 SHA512:
-  metadata.gz: 6fa8f511ead61d4a89473fdf3eef6ed58299219e98d8172098beddbda6b73ba19822c777536f924986940bac0787382b3752f1fd921405793f14dc8307ce9897
-  data.tar.gz: ca0f43716e1067f606956d14b3db8457115e57d1732c181d0006491c979b440058c8d256e3d0da5f242c99409d14392169d3d78717c6544dc8423cf3bfe94cf2
+  metadata.gz: 2a8dfd02d648d865945e4491594c591c6304b015e1c7bcf51274c1126e4a7566ae9e9fab9a958b378a78d286d2889d84248396b497efa7502f68dd80b27ac5cd
+  data.tar.gz: 4a5391e68c465616da4cc95baaee0cbd676188a0ab62275ce4fcdd691260be10c0bdd7718fca26e72ef59f8c9657031341572ab3b141fc4f792240edac004de2

data/lib/amigo/retry.rb

@@ -59,6 +59,14 @@ module Amigo
     # Raise this class, or a subclass of it, to:
     # - Use +Retry+ exception semantics while the current attempt is <= +attempts+, or
     # - Use +Die+ exception semantics if the current attempt is > +attempts+.
+    #
+    # Callers can provide a subclass with two methods that are looked for:
+    #
+    # If on_retry is defined, it is called with (worker instance, job hash).
+    # If on_retry returns +:skip+, do NOT retry (do not send to the retry set).
+    #
+    # If on_die is defined, it is called with (worker instance, job hash).
+    # If on_die returns +:skip+, do NOT send to the dead set.
     class OrDie < Error
       attr_reader :attempts, :interval_or_timestamp, :wrapped
 
@@ -99,13 +107,27 @@ module Amigo
       end
 
       def handle_retry(worker, job, e)
+        if e.respond_to?(:on_retry)
+          callback_result = e.on_retry(worker, job)
+          if callback_result == :skip
+            Sidekiq.logger.warn("skipping_retryset_schedule")
+            return
+          end
+        end
         Sidekiq.logger.info("scheduling_retry")
         job["error_class"] = e.class.to_s
         job["error_message"] = e.to_s
         self.amigo_retry_in(worker.class, job, e.interval_or_timestamp)
       end
 
-      def handle_die(_worker, job, e)
+      def handle_die(worker, job, e)
+        if e.respond_to?(:on_die)
+          callback_result = e.on_die(worker, job)
+          if callback_result == :skip
+            Sidekiq.logger.warn("skipping_deadset_send")
+            return
+          end
+        end
         Sidekiq.logger.warn("sending_to_deadset")
         job["error_class"] = e.class.to_s
         job["error_message"] = e.to_s

data/lib/amigo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Amigo
-  VERSION = "1.13.1"
+  VERSION = "1.14.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-amigo
 version: !ruby/object:Gem::Version
-  version: 1.13.1
+  version: 1.14.0
 platform: ruby
 authors:
 - Lithic Technology