sidekiq-unique-jobs 7.1.8 → 8.0.2

data/lib/sidekiq_unique_jobs/logging.rb

@@ -30,6 +30,8 @@ module SidekiqUniqueJobs
     # @yield [String, Exception] the message or exception to use for log message
     #
     def log_debug(message_or_exception = nil, item = nil, &block)
+      return unless logging?
+
       message = build_message(message_or_exception, item)
       logger.debug(message, &block)
       nil
@@ -45,6 +47,8 @@ module SidekiqUniqueJobs
     # @yield [String, Exception] the message or exception to use for log message
     #
     def log_info(message_or_exception = nil, item = nil, &block)
+      return unless logging?
+
       message = build_message(message_or_exception, item)
       logger.info(message, &block)
       nil
@@ -60,6 +64,8 @@ module SidekiqUniqueJobs
     # @yield [String, Exception] the message or exception to use for log message
     #
     def log_warn(message_or_exception = nil, item = nil, &block)
+      return unless logging?
+
       message = build_message(message_or_exception, item)
       logger.warn(message, &block)
       nil
@@ -75,6 +81,8 @@ module SidekiqUniqueJobs
     # @yield [String, Exception] the message or exception to use for log message
     #
     def log_error(message_or_exception = nil, item = nil, &block)
+      return unless logging?
+
       message = build_message(message_or_exception, item)
       logger.error(message, &block)
       nil
@@ -90,6 +98,8 @@ module SidekiqUniqueJobs
     # @yield [String, Exception] the message or exception to use for log message
     #
     def log_fatal(message_or_exception = nil, item = nil, &block)
+      return unless logging?
+
       message = build_message(message_or_exception, item)
       logger.fatal(message, &block)
 
@@ -218,5 +228,9 @@ module SidekiqUniqueJobs
 
       yield
     end
+
+    def logging?
+      SidekiqUniqueJobs.logging?
+    end
   end
 end

data/lib/sidekiq_unique_jobs/lua/delete.lua

@@ -17,7 +17,7 @@ local limit        = tonumber(ARGV[4])
 
 --------  BEGIN injected arguments --------
 local current_time = tonumber(ARGV[5])
-local debug_lua    = tostring(ARGV[6]) == "true"
+local debug_lua    = tostring(ARGV[6]) == "1"
 local max_history  = tonumber(ARGV[7])
 local script_name  = tostring(ARGV[8]) .. ".lua"
 local redisversion = tostring(ARGV[9])
@@ -33,15 +33,12 @@ log_debug("BEGIN delete", digest)
 
 local redis_version  = toversion(redisversion)
 local count          = 0
-local del_cmd        = "DEL"
 
 log_debug("ZREM", digests, digest)
 count = count + redis.call("ZREM", digests, digest)
 
-if redis_version["major"] >= 4 then del_cmd = "UNLINK"; end
-
-log_debug(del_cmd, digest, queued, primed, locked, info)
-count = count + redis.call(del_cmd, digest, queued, primed, locked, info)
+log_debug("UNLINK", digest, queued, primed, locked, info)
+count = count + redis.call("UNLINK", digest, queued, primed, locked, info)
 
 
 log("Deleted (" .. count .. ") keys")

data/lib/sidekiq_unique_jobs/lua/delete_by_digest.lua

@@ -12,7 +12,7 @@ local digests    = KEYS[9]
 
 --------  BEGIN injected arguments --------
 local current_time = tonumber(ARGV[1])
-local debug_lua    = ARGV[2] == "true"
+local debug_lua    = tostring(ARGV[2]) == "1"
 local max_history  = tonumber(ARGV[3])
 local script_name  = tostring(ARGV[4]) .. ".lua"
 local redisversion = tostring(ARGV[5])
@@ -25,14 +25,11 @@ local redisversion = tostring(ARGV[5])
 --------  BEGIN delete_by_digest.lua --------
 local counter       = 0
 local redis_version = toversion(redisversion)
-local del_cmd       = "DEL"
 
 log_debug("BEGIN delete_by_digest:", digest)
 
-if redis_version["major"] >= 4 then del_cmd = "UNLINK"; end
-
-log_debug(del_cmd, digest, queued, primed, locked, run_digest, run_queued, run_primed, run_locked)
-counter = redis.call(del_cmd, digest, queued, primed, locked, run_digest, run_queued, run_primed, run_locked)
+log_debug("UNLINK", digest, queued, primed, locked, run_digest, run_queued, run_primed, run_locked)
+counter = redis.call("UNLINK", digest, queued, primed, locked, run_digest, run_queued, run_primed, run_locked)
 
 log_debug("ZREM", digests, digest)
 redis.call("ZREM", digests, digest)

data/lib/sidekiq_unique_jobs/lua/delete_job_by_digest.lua

@@ -10,7 +10,7 @@ local digest       = ARGV[1]
 
 --------  BEGIN injected arguments --------
 local current_time = tonumber(ARGV[2])
-local debug_lua    = ARGV[3] == "true"
+local debug_lua    = tostring(ARGV[3]) == "1"
 local max_history  = tonumber(ARGV[4])
 local script_name  = tostring(ARGV[5]) .. ".lua"
 ---------  END injected arguments ---------

data/lib/sidekiq_unique_jobs/lua/find_digest_in_queues.lua

@@ -4,7 +4,7 @@ local digest = KEYS[1]
 
 --------  BEGIN injected arguments --------
 local current_time = tonumber(ARGV[2])
-local debug_lua    = ARGV[3] == "true"
+local debug_lua    = tostring(ARGV[3]) == "1"
 local max_history  = tonumber(ARGV[4])
 local script_name  = tostring(ARGV[5]) .. ".lua"
 ---------  END injected arguments ---------

data/lib/sidekiq_unique_jobs/lua/lock.lua

@@ -1,11 +1,12 @@
 -------- BEGIN keys ---------
-local digest    = KEYS[1]
-local queued    = KEYS[2]
-local primed    = KEYS[3]
-local locked    = KEYS[4]
-local info      = KEYS[5]
-local changelog = KEYS[6]
-local digests   = KEYS[7]
+local digest           = KEYS[1]
+local queued           = KEYS[2]
+local primed           = KEYS[3]
+local locked           = KEYS[4]
+local info             = KEYS[5]
+local changelog        = KEYS[6]
+local digests          = KEYS[7]
+local expiring_digests = KEYS[8]
 -------- END keys ---------
 
 
@@ -19,7 +20,7 @@ local limit        = tonumber(ARGV[4])
 
 --------  BEGIN injected arguments --------
 local current_time = tonumber(ARGV[5])
-local debug_lua    = ARGV[6] == "true"
+local debug_lua    = tostring(ARGV[6]) == "1"
 local max_history  = tonumber(ARGV[7])
 local script_name  = tostring(ARGV[8]) .. ".lua"
 local redisversion = ARGV[9]
@@ -57,8 +58,13 @@ if limit_exceeded then
   return nil
 end
 
-log_debug("ZADD", digests, current_time, digest)
-redis.call("ZADD", digests, current_time, digest)
+if lock_type == "until_expired" and pttl and pttl > 0 then
+  log_debug("ZADD", expiring_digests, current_time + pttl, digest)
+  redis.call("ZADD", expiring_digests, current_time + pttl, digest)
+else
+  log_debug("ZADD", digests, current_time, digest)
+  redis.call("ZADD", digests, current_time, digest)
+end
 
 log_debug("HSET", locked, job_id, current_time)
 redis.call("HSET", locked, job_id, current_time)

data/lib/sidekiq_unique_jobs/lua/lock_until_expired.lua

@@ -0,0 +1,92 @@
+-------- BEGIN keys ---------
+local digest           = KEYS[1]
+local queued           = KEYS[2]
+local primed           = KEYS[3]
+local locked           = KEYS[4]
+local info             = KEYS[5]
+local changelog        = KEYS[6]
+local digests          = KEYS[7]
+local expiring_digests = KEYS[8]
+-------- END keys ---------
+
+
+-------- BEGIN lock arguments ---------
+local job_id       = ARGV[1]
+local pttl         = tonumber(ARGV[2])
+local lock_type    = ARGV[3]
+local limit        = tonumber(ARGV[4])
+-------- END lock arguments -----------
+
+
+--------  BEGIN injected arguments --------
+local current_time = tonumber(ARGV[5])
+local debug_lua    = tostring(ARGV[6]) == "1"
+local max_history  = tonumber(ARGV[7])
+local script_name  = tostring(ARGV[8]) .. ".lua"
+local redisversion = ARGV[9]
+---------  END injected arguments ---------
+
+
+--------  BEGIN local functions --------
+<%= include_partial "shared/_common.lua" %>
+----------  END local functions ----------
+
+
+---------  BEGIN lock.lua ---------
+log_debug("BEGIN lock digest:", digest, "job_id:", job_id)
+
+if redis.call("HEXISTS", locked, job_id) == 1 then
+  log_debug(locked, "already locked with job_id:", job_id)
+  log("Duplicate")
+
+  log_debug("LREM", queued, -1, job_id)
+  redis.call("LREM", queued, -1, job_id)
+
+  log_debug("LREM", primed, 1, job_id)
+  redis.call("LREM", primed, 1, job_id)
+
+  return job_id
+end
+
+local locked_count   = redis.call("HLEN", locked)
+local within_limit   = limit > locked_count
+local limit_exceeded = not within_limit
+
+if limit_exceeded then
+  log_debug("Limit exceeded:", digest, "(",  locked_count, "of", limit, ")")
+  log("Limited")
+  return nil
+end
+
+log_debug("ZADD", expiring_digests, current_time + pttl, digest)
+redis.call("ZADD", expiring_digests, current_time + pttl, digest)
+
+log_debug("HSET", locked, job_id, current_time)
+redis.call("HSET", locked, job_id, current_time)
+
+log_debug("LREM", queued, -1, job_id)
+redis.call("LREM", queued, -1, job_id)
+
+log_debug("LREM", primed, 1, job_id)
+redis.call("LREM", primed, 1, job_id)
+
+-- The Sidekiq client sets pttl
+log_debug("PEXPIRE", digest, pttl)
+redis.call("PEXPIRE", digest, pttl)
+
+log_debug("PEXPIRE", locked, pttl)
+redis.call("PEXPIRE", locked, pttl)
+
+log_debug("PEXPIRE", info, pttl)
+redis.call("PEXPIRE", info, pttl)
+
+log_debug("PEXPIRE", queued, 1000)
+redis.call("PEXPIRE", queued, 1000)
+
+log_debug("PEXPIRE", primed, 1000)
+redis.call("PEXPIRE", primed, 1000)
+
+log("Locked")
+log_debug("END lock digest:", digest, "job_id:", job_id)
+return job_id
+----------  END lock.lua  ----------

data/lib/sidekiq_unique_jobs/lua/locked.lua

@@ -14,7 +14,7 @@ local job_id = ARGV[1]
 
 --------  BEGIN injected arguments --------
 local current_time = tonumber(ARGV[2])
-local debug_lua    = ARGV[3] == "true"
+local debug_lua    = tostring(ARGV[3]) == "1"
 local max_history  = tonumber(ARGV[4])
 local script_name  = tostring(ARGV[5]) .. ".lua"
 ---------  END injected arguments ---------

data/lib/sidekiq_unique_jobs/lua/queue.lua

@@ -19,7 +19,7 @@ local limit     = tonumber(ARGV[4])
 
 --------  BEGIN injected arguments --------
 local current_time = tonumber(ARGV[5])
-local debug_lua    = ARGV[6] == "true"
+local debug_lua    = tostring(ARGV[6]) == "1"
 local max_history  = tonumber(ARGV[7])
 local script_name  = tostring(ARGV[8]) .. ".lua"
 ---------  END injected arguments ---------

data/lib/sidekiq_unique_jobs/lua/reap_orphans.lua

@@ -1,9 +1,10 @@
 redis.replicate_commands()
 
 -------- BEGIN keys ---------
-local digests_set  = KEYS[1]
-local schedule_set = KEYS[2]
-local retry_set    = KEYS[3]
+local digests_set          = KEYS[1]
+local expiring_digests_set = KEYS[2]
+local schedule_set         = KEYS[3]
+local retry_set            = KEYS[4]
 --------  END keys  ---------
 
 -------- BEGIN argv ---------
@@ -13,7 +14,7 @@ local threshold    = tonumber(ARGV[2])
 
 --------  BEGIN injected arguments --------
 local current_time = tonumber(ARGV[3])
-local debug_lua    = ARGV[4] == "true"
+local debug_lua    = tostring(ARGV[4]) == "1"
 local max_history  = tonumber(ARGV[5])
 local script_name  = ARGV[6] .. ".lua"
 local redisversion = ARGV[7]
@@ -36,9 +37,6 @@ local total     = redis.call("ZCARD", digests_set)
 local index     = 0
 local del_count = 0
 local redis_ver = toversion(redisversion)
-local del_cmd   = "DEL"
-
-if tonumber(redis_ver["major"]) >= 4 then del_cmd = "UNLINK"; end
 
 repeat
   log_debug("Interating through:", digests_set, "for orphaned locks")
@@ -80,7 +78,7 @@ repeat
       local run_locked = digest .. ":RUN:LOCKED"
       local run_info   = digest .. ":RUN:INFO"
 
-      redis.call(del_cmd, digest, queued, primed, locked, info, run_digest, run_queued, run_primed, run_locked, run_info)
+      redis.call("UNLINK", digest, queued, primed, locked, info, run_digest, run_queued, run_primed, run_locked, run_info)
 
       redis.call("ZREM", digests_set, digest)
       del_count = del_count + 1
@@ -90,5 +88,32 @@ repeat
   index = index + per
 until index >= total or del_count >= reaper_count
 
+if del_count < reaper_count then
+  index = 0
+  total = redis.call("ZCOUNT", expiring_digests_set, 0, current_time)
+  repeat
+    local digests = redis.call("ZRANGEBYSCORE", expiring_digests_set, 0, current_time, "LIMIT", index, index + per -1)
+
+    for _, digest in pairs(digests) do
+      local queued     = digest .. ":QUEUED"
+      local primed     = digest .. ":PRIMED"
+      local locked     = digest .. ":LOCKED"
+      local info       = digest .. ":INFO"
+      local run_digest = digest .. ":RUN"
+      local run_queued = digest .. ":RUN:QUEUED"
+      local run_primed = digest .. ":RUN:PRIMED"
+      local run_locked = digest .. ":RUN:LOCKED"
+      local run_info   = digest .. ":RUN:INFO"
+
+      redis.call("UNLINK", digest, queued, primed, locked, info, run_digest, run_queued, run_primed, run_locked, run_info)
+
+      redis.call("ZREM", expiring_digests_set, digest)
+      del_count = del_count + 1
+    end
+
+    index = index + per
+  until index >= total or del_count >= reaper_count
+end
+
 log_debug("END")
 return del_count

data/lib/sidekiq_unique_jobs/lua/shared/_common.lua

@@ -9,11 +9,6 @@ local function toversion(version)
   }
 end
 
-local function toboolean(val)
-  val = tostring(val)
-  return val == "1" or val == "true"
-end
-
 local function log_debug( ... )
   if debug_lua ~= true then return end
 
@@ -31,7 +26,7 @@ local function log(message, prev_jid)
   log_debug("ZADD", changelog, current_time, entry);
   redis.call("ZADD", changelog, current_time, entry);
   local total_entries = redis.call("ZCARD", changelog)
-  local removed_entries = redis.call("ZREMRANGEBYRANK", changelog, max_history, -1)
+  local removed_entries = redis.call("ZREMRANGEBYRANK", changelog, 0, -1 * max_history)
   if removed_entries > 0 then
     log_debug("Removing", removed_entries , "entries from changelog (total entries", total_entries, "exceeds max_history:", max_history ..")");
   end

data/lib/sidekiq_unique_jobs/lua/shared/_delete_from_sorted_set.lua

@@ -3,6 +3,7 @@ local function delete_from_sorted_set(name, digest)
   local total = redis.call("zcard", name)
   local index = 0
   local result
+
   while (index < total) do
     local items = redis.call("ZRANGE", name, index, index + per -1)
     for _, item in pairs(items) do

data/lib/sidekiq_unique_jobs/lua/shared/_find_digest_in_process_set.lua

@@ -15,7 +15,7 @@ local function find_digest_in_process_set(digest, threshold)
     log_debug("Found number of processes:", #processes, "next cursor:", next_process_cursor)
 
     for _, process in ipairs(processes) do
-      local workers_key = process .. ":workers"
+      local workers_key = process .. ":work"
       log_debug("searching in process set:", process,
                 "for digest:", digest,
                 "cursor:", process_cursor)

data/lib/sidekiq_unique_jobs/lua/unlock.lua

@@ -19,7 +19,7 @@ local limit     = tonumber(ARGV[4])
 
 --------  BEGIN injected arguments --------
 local current_time = tonumber(ARGV[5])
-local debug_lua    = ARGV[6] == "true"
+local debug_lua    = tostring(ARGV[6]) == "1"
 local max_history  = tonumber(ARGV[7])
 local script_name  = tostring(ARGV[8]) .. ".lua"
 local redisversion = ARGV[9]
@@ -65,20 +65,11 @@ redis.call("LREM", queued, -1, job_id)
 log_debug("LREM", primed, -1, job_id)
 redis.call("LREM", primed, -1, job_id)
 
-if limit and limit <= 1 and locked_count and locked_count <= 1 then
-  log_debug("ZREM", digests, digest)
-  redis.call("ZREM", digests, digest)
-end
-
 local redis_version = toversion(redisversion)
-local del_cmd       = "DEL"
-
-if tonumber(redis_version["major"]) >= 4 then del_cmd =  "UNLINK"; end
 
 if lock_type ~= "until_expired" then
-
-  log_debug(del_cmd, digest, info)
-  redis.call(del_cmd, digest, info)
+  log_debug("UNLINK", digest, info)
+  redis.call("UNLINK", digest, info)
 
   log_debug("HDEL", locked, job_id)
   redis.call("HDEL", locked, job_id)
@@ -86,9 +77,19 @@ end
 
 local locked_count = redis.call("HLEN", locked)
 
-if tonumber(locked_count) < 1 then
-  log_debug(del_cmd, locked)
-  redis.call(del_cmd, locked)
+if locked_count and locked_count < 1 then
+  log_debug("UNLINK", locked)
+  redis.call("UNLINK", locked)
+end
+
+if redis.call("LLEN", primed) == 0 then
+  log_debug("UNLINK", primed)
+  redis.call("UNLINK", primed)
+end
+
+if limit and limit <= 1 and locked_count and locked_count <= 1 then
+  log_debug("ZREM", digests, digest)
+  redis.call("ZREM", digests, digest)
 end
 
 log_debug("LPUSH", queued, "1")

data/lib/sidekiq_unique_jobs/lua/update_version.lua

@@ -9,7 +9,7 @@ local version  = ARGV[1]
 
 --------  BEGIN injected arguments --------
 local current_time = tonumber(ARGV[2])
-local debug_lua    = ARGV[3] == "true"
+local debug_lua    = tostring(ARGV[3]) == "1"
 local max_history  = tonumber(ARGV[4])
 local script_name  = tostring(ARGV[5]) .. ".lua"
 ---------  END injected arguments ---------

data/lib/sidekiq_unique_jobs/lua/upgrade.lua

@@ -6,7 +6,7 @@ local dead_version = KEYS[2]
 
 --------  BEGIN injected arguments --------
 local current_time = tonumber(ARGV[5])
-local debug_lua    = ARGV[6] == "true"
+local debug_lua    = tostring(ARGV[6]) == "1"
 local max_history  = tonumber(ARGV[7])
 local script_name  = tostring(ARGV[8]) .. ".lua"
 local redisversion = ARGV[9]
@@ -22,9 +22,7 @@ local new_version   = redis.call("GET", live_version)
 local old_version   = redis.call("GET", dead_version)
 local redis_version = toversion(redisversion)
 local upgraded      = 0
-local del_cmd       = "DEL"
 
-if redis_version["major"] >= 4 then del_cmd = "UNLINK"; end
 --------  BEGIN delete.lua --------
 
 log_debug("BEGIN upgrading from: ", old_version, "to:", new_version)

data/lib/sidekiq_unique_jobs/middleware/client.rb

@@ -6,6 +6,8 @@ module SidekiqUniqueJobs
     #
     # @author Mikael Henriksson <mikael@mhenrixon.com>
     class Client
+      include Sidekiq::ClientMiddleware if defined?(Sidekiq::ClientMiddleware)
+
       # prepend "SidekiqUniqueJobs::Middleware"
       # @!parse prepends SidekiqUniqueJobs::Middleware
       prepend SidekiqUniqueJobs::Middleware

data/lib/sidekiq_unique_jobs/middleware/server.rb

@@ -6,6 +6,8 @@ module SidekiqUniqueJobs
     #
     # @author Mikael Henriksson <mikael@mhenrixon.com>
     class Server
+      include Sidekiq::ServerMiddleware if defined?(Sidekiq::ServerMiddleware)
+
       # prepend "SidekiqUniqueJobs::Middleware"
       # @!parse prepends SidekiqUniqueJobs::Middleware
       prepend SidekiqUniqueJobs::Middleware

data/lib/sidekiq_unique_jobs/middleware.rb

@@ -29,10 +29,10 @@ module SidekiqUniqueJobs
     # @yieldparam [<type>] if <description>
     # @yieldreturn [<type>] <describe what yield should return>
     def call(worker_class, item, queue, redis_pool = nil)
-      @worker_class = worker_class
-      @item         = item
-      @queue        = queue
-      @redis_pool   = redis_pool
+      @item       = item
+      @queue      = queue
+      @redis_pool = redis_pool
+      self.job_class = worker_class
       return yield if unique_disabled?
 
       SidekiqUniqueJobs::Job.prepare(item) unless item[LOCK_DIGEST]

data/lib/sidekiq_unique_jobs/on_conflict/reject.rb

@@ -12,33 +12,6 @@ module SidekiqUniqueJobs
       def call
         log_info { "Adding dead #{item[CLASS]} job #{item[JID]}" }
 
-        if deadset_kill?
-          deadset_kill
-        else
-          push_to_deadset
-        end
-      end
-
-      #
-      # Sidekiq version compatibility check
-      # @api private
-      #
-      #
-      # @return [true, false] depending on if Sidekiq::Deadset responds to kill
-      #
-      def deadset_kill?
-        deadset.respond_to?(:kill)
-      end
-
-      #
-      # Use Sidekiqs built in Sidekiq::DeadSet#kill
-      #   to get rid of the job
-      # @api private
-      #
-      #
-      # @return [void]
-      #
-      def deadset_kill
         if kill_with_options?
           kill_job_with_options
         else
@@ -88,22 +61,6 @@ module SidekiqUniqueJobs
         @deadset ||= Sidekiq::DeadSet.new
       end
 
-      #
-      # Used for compatibility with older Sidekiq versions
-      #
-      #
-      # @return [void]
-      #
-      def push_to_deadset
-        redis do |conn|
-          conn.multi do
-            conn.zadd("dead", now_f, payload)
-            conn.zremrangebyscore("dead", "-inf", now_f - Sidekiq::DeadSet.timeout)
-            conn.zremrangebyrank("dead", 0, -Sidekiq::DeadSet.max_jobs)
-          end
-        end
-      end
-
       #
       # The Sidekiq job hash as JSON
       #

data/lib/sidekiq_unique_jobs/on_conflict/reschedule.rb

@@ -14,14 +14,14 @@ module SidekiqUniqueJobs
       # @param [Hash] item sidekiq job hash
       def initialize(item, redis_pool = nil)
         super(item, redis_pool)
-        @worker_class = item[CLASS]
+        self.job_class = item[CLASS]
       end
 
       # Create a new job from the current one.
       #   This will mess up sidekiq stats because a new job is created
       def call
-        if sidekiq_worker_class?
-          if worker_class.perform_in(5, *item[ARGS])
+        if sidekiq_job_class?
+          if job_class.set(queue: item["queue"].to_sym).perform_in(5, *item[ARGS])
             reflect(:rescheduled, item)
           else
             reflect(:reschedule_failed, item)

data/lib/sidekiq_unique_jobs/options_with_fallback.rb

@@ -6,7 +6,7 @@ module SidekiqUniqueJobs
   # Requires the following methods to be defined in the including class
   #   1. item (required)
   #   2. options (can be nil)
-  #   3. worker_class (required, can be anything)
+  #   3. job_class (required, can be anything)
   # @author Mikael Henriksson <mikael@mhenrixon.com>
   module OptionsWithFallback
     def self.included(base)
@@ -69,8 +69,8 @@ module SidekiqUniqueJobs
     #
     def options
       @options ||= begin
-        opts = default_worker_options.dup
-        opts.merge!(worker_options) if sidekiq_worker_class?
+        opts = default_job_options.dup
+        opts.merge!(job_options) if sidekiq_job_class?
         (opts || {}).stringify_keys
       end
     end

data/lib/sidekiq_unique_jobs/orphans/lua_reaper.rb

@@ -20,7 +20,7 @@ module SidekiqUniqueJobs
         call_script(
           :reap_orphans,
           conn,
-          keys: [DIGESTS, SCHEDULE, RETRY, PROCESSES],
+          keys: [DIGESTS, EXPIRING_DIGESTS, SCHEDULE, RETRY, PROCESSES],
           argv: [reaper_count, (Time.now - reaper_timeout).to_f],
         )
       end

data/lib/sidekiq_unique_jobs/orphans/manager.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "concurrent/version"
+
 module SidekiqUniqueJobs
   module Orphans
     #
@@ -108,9 +110,7 @@ module SidekiqUniqueJobs
       # @return [Hash]
       #
       def timer_task_options
-        { run_now: true,
-          execution_interval: reaper_interval,
-          timeout_interval: reaper_timeout }
+        { run_now: true, execution_interval: reaper_interval }
       end
 
       #
@@ -127,13 +127,6 @@ module SidekiqUniqueJobs
         SidekiqUniqueJobs.config.reaper_interval
       end
 
-      #
-      # @see SidekiqUniqueJobs::Config#reaper_timeout
-      #
-      def reaper_timeout
-        SidekiqUniqueJobs.config.reaper_timeout
-      end
-
       #
       # A context to use for all log entries
       #
@@ -224,7 +217,7 @@ module SidekiqUniqueJobs
 
       #
       # Reaper interval with a little drift
-      #   Redis isn't exact enough so to give a little bufffer,
+      #   Redis isn't exact enough so to give a little buffer,
       #   we add a tiny value to the reaper interval.
       #
       #