retry_jobs now requires the sidekiq API due to recent constant extrac…

…tion, fixes sidekiq#1915
spastorino · Aug 28, 2014 · 055fdfd · 055fdfd
1 parent dffdd22
commit 055fdfd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/lib/sidekiq/api.rb b/lib/sidekiq/api.rb
@@ -326,7 +326,7 @@ def kill
         Sidekiq.redis do |conn|
           conn.multi do
             conn.zadd('dead', now, message)
-            conn.zremrangebyscore('dead', '-inf', now - DeadSet::DEAD_JOB_TIMEOUT)
+            conn.zremrangebyscore('dead', '-inf', now - DeadSet::TIMEOUT)
             conn.zremrangebyrank('dead', 0, - DeadSet::MAX_JOBS)
           end
         end
@@ -520,7 +520,7 @@ def retry_all
   # Allows enumeration of dead jobs within Sidekiq.
   #
   class DeadSet < JobSet
-    DEAD_JOB_TIMEOUT = 180 * 24 * 60 * 60 # 6 months
+    TIMEOUT = 180 * 24 * 60 * 60 # 6 months
     MAX_JOBS = 10_000
 
     def initialize

diff --git a/lib/sidekiq/middleware/server/retry_jobs.rb b/lib/sidekiq/middleware/server/retry_jobs.rb
@@ -1,4 +1,5 @@
 require 'sidekiq/scheduled'
+require 'sidekiq/api'
 
 module Sidekiq
   module Middleware
@@ -131,9 +132,6 @@ def call(worker, msg, queue)
 
         private
 
-        DEAD_JOB_TIMEOUT = 180 * 24 * 60 * 60 # 6 months
-        MAX_JOBS = 10_000
-
         def retries_exhausted(worker, msg)
           logger.debug { "Dropping message after hitting the retry maximum: #{msg}" }
           begin
@@ -154,7 +152,7 @@ def send_to_morgue(msg)
           Sidekiq.redis do |conn|
             conn.multi do
               conn.zadd('dead', now, payload)
-              conn.zremrangebyscore('dead', '-inf', now - DeadSet::DEAD_JOB_TIMEOUT)
+              conn.zremrangebyscore('dead', '-inf', now - DeadSet::TIMEOUT)
               conn.zremrangebyrank('dead', 0, -DeadSet::MAX_JOBS)
             end
           end