sidekiq-amigo 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cf72dfd7e1bbcc7217536a2344ce5ecdec41c0ae8769b44ec91b210b9a41d0b
-  data.tar.gz: 19f5fd437e47f5f2dc706877289f05fd7ee0d50426d4de42ac2bbdc304f9d882
+  metadata.gz: a32299bc84d87b6c497414b4fcb6b89278e2993543eff1ba07bcf1a9fb75c59f
+  data.tar.gz: 27acf41f1e0235536da93d7dfd0b2a5ad1f65e4e993f428967e8072e7213f83f
 SHA512:
-  metadata.gz: 970fa43283e3361af6b7caa12241ad1848426af476d0023a38148d435dbb07b7eabe31a79c2e0c23bce380097e1c5f9282eb16ef16a6e6372e6185fa1243744b
-  data.tar.gz: 7e421c9750235136306e8ae9010101d2611c4e8cf54a0cf8192407adba26e160ec17247db045d1e6c9c85c89cc67a383379bc625f01c88f81da683ca338ce860
+  metadata.gz: 47e75ba71d67411a80e7d5ae20f06c0b3bb4e0fb056356e63fb47ec3cd84cdb72f0deb6e2bd00f5cc0cd091267dc30725e4607ae018b7f29a31093c4c9e82ebd
+  data.tar.gz: 761f7febdba270fe365f39cb740f734615118bd8c160485ac9296119f00124458f1970e159dbdd0ed8a6fbecd4c66df8bfe07f86803a14e2982e738fbe69115c

data/lib/amigo/retry.rb

@@ -17,18 +17,29 @@ require "sidekiq/api"
 #   end
 module Amigo
   module Retry
-    class Error < StandardError; end
+    class Error < StandardError
+      protected def exc_or_msg(timing_msg, obj)
+        return timing_msg if obj.nil?
+        return obj.to_s unless obj.is_a?(Exception)
+        return "#{timing_msg} (#{obj.class}: #{obj.message})"
+      end
+
+      protected def exc?(ex)
+        return ex.is_a?(Exception) ? ex : nil
+      end
+    end
 
     # Raise this class, or a subclass of it, to schedule a later retry,
     # rather than using an error to trigger Sidekiq's default retry behavior.
     # The benefit here is that it allows a consistent, customizable behavior,
     # so is better for 'expected' errors like rate limiting.
     class Retry < Error
-      attr_accessor :interval_or_timestamp
+      attr_accessor :interval_or_timestamp, :wrapped
 
       def initialize(interval_or_timestamp, msg=nil)
         @interval_or_timestamp = interval_or_timestamp
-        super(msg || "retry job in #{interval_or_timestamp}")
+        @wrapped = exc?(msg)
+        super(exc_or_msg("retry job in #{interval_or_timestamp.to_i}s", msg))
       end
     end
 
@@ -37,18 +48,25 @@ module Amigo
     # This allows jobs to hard-fail when there is something like a total outage,
     # rather than retrying.
     class Die < Error
+      attr_accessor :wrapped
+
+      def initialize(msg=nil)
+        @wrapped = exc?(msg)
+        super(exc_or_msg("kill job", msg))
+      end
     end
 
     # 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+.
     class OrDie < Error
-      attr_reader :attempts, :interval_or_timestamp
+      attr_reader :attempts, :interval_or_timestamp, :wrapped
 
       def initialize(attempts, interval_or_timestamp, msg=nil)
+        @wrapped = exc?(msg)
         @attempts = attempts
         @interval_or_timestamp = interval_or_timestamp
-        super(msg || "retry every #{interval_or_timestamp} up to #{attempts} times")
+        super(exc_or_msg("retry every #{interval_or_timestamp.to_i}s up to #{attempts} times", msg))
       end
     end
 
@@ -56,6 +74,12 @@ module Amigo
     # from deep in a job and they want to jump out of the whole thing.
     # Usually you should log before raising this!
     class Quit < Error
+      attr_accessor :wrapped
+
+      def initialize(msg=nil)
+        @wrapped = exc?(msg)
+        super(exc_or_msg("quit job", msg))
+      end
     end
 
     class ServerMiddleware

data/lib/amigo/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-amigo
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Lithic Technology
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-12 00:00:00.000000000 Z
+date: 2024-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq