Refactor into a class

lib/sidekiq/middleware/server/retry_jobs.rb

@@ -1,4 +1,5 @@
 require 'sidekiq/scheduled'
+require 'sidekiq/retry_delay'
 
 module Sidekiq
   module Middleware
@@ -111,18 +112,7 @@ module Sidekiq
 
         # delayed_job uses the same basic formula
         def seconds_to_delay(worker, count)
-          default_retry_in = (count ** 4) + 15 + (rand(30)*(count+1))
+          RetryDelay.new(count, worker.sidekiq_retry_with, logger).seconds_to_delay
-
-          if worker.sidekiq_retry_with?
-            begin
-              worker.sidekiq_retry_with.call(count)
-            rescue Exception => e
-              logger.error { "Failure scheduling retry using the defined `sidekiq_retry_in`, falling back to the default! #{e.message}"}
-              default_retry_in
-            end
-          else
-            default_retry_in
-          end
         end
       end
     end

lib/sidekiq/retry_delay.rb

@@ -0,0 +1,26 @@
+module Sidekiq
+  class RetryDelay
+    attr_reader :delay_with, :count, :logger
+
+    def initialize(count, delay_with, logger)
+      @count      = count
+      @delay_with = delay_with
+      @logger     = logger
+    end
+
+    def seconds_to_delay
+      user_defined_delay || default_delay
+    end
+
+    private
+    def default_delay
+      (count ** 4) + 15 + (rand(30)*(count+1))
+    end
+
+    def user_defined_delay
+      delay_with.call(count) if delay_with.respond_to?(:call)
+    rescue Exception => e
+      logger.error { "Failure scheduling retry using the defined `sidekiq_retry_in`, falling back to the default! #{e.message}"}
+    end
+  end
+end