funktor 0.7.25 → 0.7.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4efb77bf5008c8b7045610883ea0f0229a8ebaa89d1b5f3dd4846c3e0bc7ddd4
-  data.tar.gz: ad9b24108efdc8747d863bc9afbf0b47fe9508c6804f48ca80eba314e681a474
+  metadata.gz: fe7973cd6c5d59ac83b10c4726244665bd0584f7abad03ccb89a49f6e20daf3b
+  data.tar.gz: ea2f3d112ff0565b1d21a72fb8398f7f776eca2f28368d0c1d397cdd24a50090
 SHA512:
-  metadata.gz: a1d9c1547d1195bab096469043bef6bd63d4183b005a1ee6e08d60ad5f894fe79d0bdeaa33a446966566904a99a088045c66348f0eb9ca5aca1543b75adf9595
-  data.tar.gz: ead715f1b9673487067fea8206e0bb9a0fb74bcc2a79e43bf3e07703df9a5d3f0fc3361bcde55357ef223078ed7dc1e215d325354614f379138142cc33e07bc3
+  metadata.gz: 5daf5129ffd987d9370a31405655c5940ab4eb0a0d2eb3fdb5d53fdb7794c8b5723999d359b3bc5cf56738ea89c027f7fffb84f1d68f49d0c1383a9d47f0b217
+  data.tar.gz: 9151e301390aa929b0de57aa3c8c909c3d858315528f121077e8ff4e99427a6de7f4904be66ba777b5c16e032d496f6e42e19a3d711f8d2ea259c245872e4bd9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    funktor (0.7.25)
+    funktor (0.7.26)
       activesupport
       aws-sdk-dynamodb (~> 1.62)
       aws-sdk-sqs (~> 1.37)

data/lib/funktor/job.rb

@@ -114,8 +114,16 @@ module Funktor
       self.delay = seconds_to_delay(retries)
     end
 
-    # delayed_job and sidekiq use the same basic formula
     def seconds_to_delay(count)
+      if worker_class&.funktor_retry_in_block
+        worker_class.funktor_retry_in_block.call(count)
+      else
+        default_seconds_to_delay(count)
+      end
+    end
+
+    # delayed_job and sidekiq use the same basic formula
+    def default_seconds_to_delay(count)
       (count**4) + 15 + (rand(30) * (count + 1))
     end
 
@@ -124,7 +132,7 @@ module Funktor
     end
 
     def retry_limit
-      25
+      worker_class&.custom_retry_limit || 25
     end
 
     def can_retry

data/lib/funktor/version.rb

@@ -1,3 +1,3 @@
 module Funktor
-  VERSION = "0.7.25"
+  VERSION = "0.7.26"
 end

data/lib/funktor/worker/funktor_options.rb

@@ -7,6 +7,7 @@ module Funktor
         base.extend ClassMethods
         base.class_eval do
           class_attribute :funktor_options_hash
+          class_attribute :funktor_retry_in_block
         end
       end
       module ClassMethods
@@ -18,6 +19,10 @@ module Funktor
           self.funktor_options_hash || {}
         end
 
+        def funktor_retry_in(&block)
+          self.funktor_retry_in_block = block
+        end
+
         def custom_queue_url
           get_funktor_options[:queue_url]
         end
@@ -26,6 +31,16 @@ module Funktor
           get_funktor_options[:queue]
         end
 
+        def custom_retry_limit
+          retry_limit = get_funktor_options[:retry]
+          if retry_limit.nil?
+            retry_limit = 25
+          elsif !retry_limit # if someone did "retry: false"
+            retry_limit = 0
+          end
+          return retry_limit
+        end
+
         def queue_url
           custom_queue_url
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: funktor
 version: !ruby/object:Gem::Version
-  version: 0.7.25
+  version: 0.7.26
 platform: ruby
 authors:
 - Jeremy Green
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-06 00:00:00.000000000 Z
+date: 2022-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-sqs