sidekiq-unique-jobs 7.0.0.beta21 → 7.0.0.beta26

data/lib/sidekiq_unique_jobs/job.rb

@@ -3,7 +3,7 @@
 module SidekiqUniqueJobs
   # Utility class to append uniqueness to the sidekiq job hash
   #
-  # @author Mikael Henriksson <mikael@zoolutions.se>
+  # @author Mikael Henriksson <mikael@mhenrixon.com>
   module Job
     extend self
 
@@ -40,19 +40,19 @@ module SidekiqUniqueJobs
     end
 
     def add_lock_timeout(item)
-      item[LOCK_TIMEOUT] = SidekiqUniqueJobs::LockTimeout.calculate(item)
+      item[LOCK_TIMEOUT] ||= SidekiqUniqueJobs::LockTimeout.calculate(item)
     end
 
     def add_lock_args(item)
-      item[LOCK_ARGS] = SidekiqUniqueJobs::LockArgs.call(item)
+      item[LOCK_ARGS] ||= SidekiqUniqueJobs::LockArgs.call(item)
     end
 
     def add_lock_digest(item)
-      item[LOCK_DIGEST] = SidekiqUniqueJobs::LockDigest.call(item)
+      item[LOCK_DIGEST] ||= SidekiqUniqueJobs::LockDigest.call(item)
     end
 
     def add_lock_prefix(item)
-      item[LOCK_PREFIX] = SidekiqUniqueJobs.config.unique_prefix
+      item[LOCK_PREFIX] ||= SidekiqUniqueJobs.config.unique_prefix
     end
   end
 end

data/lib/sidekiq_unique_jobs/json.rb

@@ -3,7 +3,7 @@
 module SidekiqUniqueJobs
   # Handles loading and dumping of json
   #
-  # @author Mikael Henriksson <mikael@zoolutions.se>
+  # @author Mikael Henriksson <mikael@mhenrixon.com>
   module JSON
     module_function
 

data/lib/sidekiq_unique_jobs/key.rb

@@ -3,7 +3,7 @@
 module SidekiqUniqueJobs
   # Key class wraps logic dealing with various lock keys
   #
-  # @author Mikael Henriksson <mikael@zoolutions.se>
+  # @author Mikael Henriksson <mikael@mhenrixon.com>
   class Key
     #
     # @!attribute [r] digest

data/lib/sidekiq_unique_jobs/lock.rb

@@ -4,7 +4,7 @@ module SidekiqUniqueJobs
   #
   # Class Lock provides access to information about a lock
   #
-  # @author Mikael Henriksson <mikael@zoolutions.se>
+  # @author Mikael Henriksson <mikael@mhenrixon.com>
   #
   class Lock # rubocop:disable Metrics/ClassLength
     # includes "SidekiqUniqueJobs::Connection"

data/lib/sidekiq_unique_jobs/lock/base_lock.rb

@@ -5,7 +5,7 @@ module SidekiqUniqueJobs
     # Abstract base class for locks
     #
     # @abstract
-    # @author Mikael Henriksson <mikael@zoolutions.se>
+    # @author Mikael Henriksson <mikael@mhenrixon.com>
     class BaseLock
       include SidekiqUniqueJobs::Logging
 

data/lib/sidekiq_unique_jobs/lock/client_validator.rb

@@ -5,7 +5,7 @@ module SidekiqUniqueJobs
     #
     # Validates the sidekiq options for the Sidekiq client process
     #
-    # @author Mikael Henriksson <mikael@zoolutions.se>
+    # @author Mikael Henriksson <mikael@mhenrixon.com>
     #
     class ClientValidator
       #

data/lib/sidekiq_unique_jobs/lock/server_validator.rb

@@ -5,7 +5,7 @@ module SidekiqUniqueJobs
     #
     # Validates the sidekiq options for the Sidekiq server process
     #
-    # @author Mikael Henriksson <mikael@zoolutions.se>
+    # @author Mikael Henriksson <mikael@mhenrixon.com>
     #
     class ServerValidator
       #

data/lib/sidekiq_unique_jobs/lock/until_and_while_executing.rb

@@ -11,7 +11,7 @@ module SidekiqUniqueJobs
     # See {#lock} for more information about the client.
     # See {#execute} for more information about the server
     #
-    # @author Mikael Henriksson <mikael@zoolutions.se>
+    # @author Mikael Henriksson <mikael@mhenrixon.com>
     class UntilAndWhileExecuting < BaseLock
       # Executes in the Sidekiq server process
       # @yield to the worker class perform method

data/lib/sidekiq_unique_jobs/lock/until_executed.rb

@@ -6,7 +6,7 @@ module SidekiqUniqueJobs
     # - Locks on perform_in or perform_async
     # - Unlocks after yielding to the worker's perform method
     #
-    # @author Mikael Henriksson <mikael@zoolutions.se>
+    # @author Mikael Henriksson <mikael@mhenrixon.com>
     class UntilExecuted < BaseLock
       OK ||= "OK"
 

data/lib/sidekiq_unique_jobs/lock/until_executing.rb

@@ -6,7 +6,7 @@ module SidekiqUniqueJobs
     # - Locks on perform_in or perform_async
     # - Unlocks before yielding to the worker's perform method
     #
-    # @author Mikael Henriksson <mikael@zoolutions.se>
+    # @author Mikael Henriksson <mikael@mhenrixon.com>
     class UntilExecuting < BaseLock
       # Executes in the Sidekiq server process
       # @yield to the worker class perform method

data/lib/sidekiq_unique_jobs/lock/until_expired.rb

@@ -5,7 +5,7 @@ module SidekiqUniqueJobs
     #
     # UntilExpired locks until the job expires
     #
-    # @author Mikael Henriksson <mikael@zoolutions.se>
+    # @author Mikael Henriksson <mikael@mhenrixon.com>
     #
     class UntilExpired < UntilExecuted
     end

data/lib/sidekiq_unique_jobs/lock/validator.rb

@@ -5,7 +5,7 @@ module SidekiqUniqueJobs
     #
     # Validator base class to avoid some duplication
     #
-    # @author Mikael Henriksson <mikael@zoolutions.se>
+    # @author Mikael Henriksson <mikael@mhenrixon.com>
     #
     class Validator
       #

data/lib/sidekiq_unique_jobs/lock/while_executing.rb

@@ -9,7 +9,7 @@ module SidekiqUniqueJobs
     # See {#lock} for more information about the client.
     # See {#execute} for more information about the server
     #
-    # @author Mikael Henriksson <mikael@zoolutions.se>
+    # @author Mikael Henriksson <mikael@mhenrixon.com>
     class WhileExecuting < BaseLock
       RUN_SUFFIX ||= ":RUN"
 

data/lib/sidekiq_unique_jobs/lock/while_executing_reject.rb

@@ -9,7 +9,7 @@ module SidekiqUniqueJobs
     # See {#lock} for more information about the client.
     # See {#execute} for more information about the server
     #
-    # @author Mikael Henriksson <mikael@zoolutions.se>
+    # @author Mikael Henriksson <mikael@mhenrixon.com>
     class WhileExecutingReject < WhileExecuting
       # Overridden with a forced {OnConflict::Reject} strategy
       # @return [OnConflict::Reject] a reject strategy

data/lib/sidekiq_unique_jobs/lock_args.rb

@@ -3,7 +3,7 @@
 module SidekiqUniqueJobs
   # Handles uniqueness of sidekiq arguments
   #
-  # @author Mikael Henriksson <mikael@zoolutions.se>
+  # @author Mikael Henriksson <mikael@mhenrixon.com>
   class LockArgs
     include SidekiqUniqueJobs::Logging
     include SidekiqUniqueJobs::SidekiqWorkerMethods
@@ -97,7 +97,7 @@ module SidekiqUniqueJobs
     end
 
     # The method to use for filtering unique arguments
-    def lock_args_method
+    def lock_args_method # rubocop:disable Metrics/CyclomaticComplexity
       @lock_args_method ||= worker_options[LOCK_ARGS] || worker_options[UNIQUE_ARGS]
       @lock_args_method ||= :lock_args if worker_method_defined?(:lock_args)
       @lock_args_method ||= :unique_args if worker_method_defined?(:unique_args)

data/lib/sidekiq_unique_jobs/lock_config.rb

@@ -5,7 +5,7 @@ module SidekiqUniqueJobs
   # Gathers all configuration for a lock
   #   which helps reduce the amount of instance variables
   #
-  # @author Mikael Henriksson <mikael@zoolutions.se>
+  # @author Mikael Henriksson <mikael@mhenrixon.com>
   #
   class LockConfig
     #
@@ -59,12 +59,12 @@ module SidekiqUniqueJobs
     def initialize(job_hash = {})
       @type        = job_hash[LOCK]&.to_sym
       @worker      = job_hash[CLASS]
-      @limit       = job_hash.fetch(LOCK_LIMIT) { 1 }
-      @timeout     = job_hash.fetch(LOCK_TIMEOUT) { 0 }
-      @ttl         = job_hash.fetch(LOCK_TTL) { job_hash.fetch(LOCK_EXPIRATION) { nil } }.to_i
+      @limit       = job_hash.fetch(LOCK_LIMIT, 1)
+      @timeout     = job_hash.fetch(LOCK_TIMEOUT, 0)
+      @ttl         = job_hash.fetch(LOCK_TTL) { job_hash.fetch(LOCK_EXPIRATION, nil) }.to_i
       @pttl        = ttl * 1_000
       @lock_info   = job_hash.fetch(LOCK_INFO) { SidekiqUniqueJobs.config.lock_info }
-      @on_conflict = job_hash.fetch(ON_CONFLICT) { nil }
+      @on_conflict = job_hash.fetch(ON_CONFLICT, nil)
       @errors      = job_hash.fetch(ERRORS) { {} }
 
       @on_client_conflict = job_hash[ON_CLIENT_CONFLICT]

data/lib/sidekiq_unique_jobs/lock_digest.rb

@@ -5,7 +5,7 @@ require "openssl"
 module SidekiqUniqueJobs
   # Handles uniqueness of sidekiq arguments
   #
-  # @author Mikael Henriksson <mikael@zoolutions.se>
+  # @author Mikael Henriksson <mikael@mhenrixon.com>
   class LockDigest
     include SidekiqUniqueJobs::Logging
     include SidekiqUniqueJobs::JSON
@@ -58,7 +58,7 @@ module SidekiqUniqueJobs
     # Filter a hash to use for digest
     # @return [Hash] to use for digest
     def digestable_hash
-      @item.slice(CLASS, QUEUE, LOCK_ARGS).tap do |hash|
+      @item.slice(CLASS, QUEUE, LOCK_ARGS, APARTMENT).tap do |hash|
         hash.delete(QUEUE) if unique_across_queues?
         hash.delete(CLASS) if unique_across_workers?
       end

data/lib/sidekiq_unique_jobs/lock_info.rb

@@ -4,7 +4,7 @@ module SidekiqUniqueJobs
   #
   # Class Info provides information about a lock
   #
-  # @author Mikael Henriksson <mikael@zoolutions.se>
+  # @author Mikael Henriksson <mikael@mhenrixon.com>
   #
   class LockInfo < Redis::String
     #

data/lib/sidekiq_unique_jobs/lock_timeout.rb

@@ -3,7 +3,7 @@
 module SidekiqUniqueJobs
   # Calculates timeout and expiration
   #
-  # @author Mikael Henriksson <mikael@zoolutions.se>
+  # @author Mikael Henriksson <mikael@mhenrixon.com>
   class LockTimeout
     # includes "SidekiqUniqueJobs::SidekiqWorkerMethods"
     # @!parse include SidekiqUniqueJobs::SidekiqWorkerMethods

data/lib/sidekiq_unique_jobs/lock_ttl.rb

@@ -3,7 +3,7 @@
 module SidekiqUniqueJobs
   # Calculates timeout and expiration
   #
-  # @author Mikael Henriksson <mikael@zoolutions.se>
+  # @author Mikael Henriksson <mikael@mhenrixon.com>
   class LockTTL
     # includes "SidekiqUniqueJobs::SidekiqWorkerMethods"
     # @!parse include SidekiqUniqueJobs::SidekiqWorkerMethods

data/lib/sidekiq_unique_jobs/locksmith.rb

@@ -3,7 +3,7 @@
 module SidekiqUniqueJobs
   # Lock manager class that handles all the various locks
   #
-  # @author Mikael Henriksson <mikael@zoolutions.se>
+  # @author Mikael Henriksson <mikael@mhenrixon.com>
   class Locksmith # rubocop:disable Metrics/ClassLength
     # includes "SidekiqUniqueJobs::Connection"
     # @!parse include SidekiqUniqueJobs::Connection

data/lib/sidekiq_unique_jobs/logging.rb

@@ -3,7 +3,7 @@
 module SidekiqUniqueJobs
   # Utility module for reducing the number of uses of logger.
   #
-  # @author Mikael Henriksson <mikael@zoolutions.se>
+  # @author Mikael Henriksson <mikael@mhenrixon.com>
   module Logging
     def self.included(base)
       base.send(:extend, self)
@@ -114,8 +114,8 @@ module SidekiqUniqueJobs
     #
     # @yield
     #
-    def with_configured_loggers_context
-      logger_method.call(logging_context) { yield }
+    def with_configured_loggers_context(&block)
+      logger_method.call(logging_context, &block)
     end
 
     #

data/lib/sidekiq_unique_jobs/logging/middleware_context.rb

@@ -4,13 +4,13 @@ module SidekiqUniqueJobs
   #
   # Provides the sidekiq middleware that makes the gem work
   #
-  # @author Mikael Henriksson <mikael@zoolutions.se>
+  # @author Mikael Henriksson <mikael@mhenrixon.com>
   #
   module Logging
     #
     # Context aware logging for Sidekiq Middlewares
     #
-    # @author Mikael Henriksson <mikael@zoolutions.se>
+    # @author Mikael Henriksson <mikael@mhenrixon.com>
     #
     module Middleware
       include Logging

data/lib/sidekiq_unique_jobs/lua/reap_orphans.lua

@@ -65,11 +65,7 @@ repeat
     -- TODO: Add check for jobs checked out by process
     if found ~= true then
       log_debug("Searching for digest:", digest, "in process sets")
-      local queue = find_digest_in_process_set(digest)
-      if queue then
-        log_debug("found digest:", digest, "in queue:", queue)
-        found = true
-      end
+      found = find_digest_in_process_set(digest)
     end
 
     if found ~= true then

data/lib/sidekiq_unique_jobs/lua/shared/_delete_from_queue.lua

@@ -6,6 +6,9 @@ local function delete_from_queue(queue, digest)
 
   while (index < total) do
     local items = redis.call("LRANGE", queue, index, index + per -1)
+    if #items == 0 then
+      break
+    end
     for _, item in pairs(items) do
       if string.find(item, digest) then
         redis.call("LREM", queue, 1, item)

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

@@ -4,7 +4,7 @@ local function find_digest_in_process_set(digest)
   local pattern        = "*" .. digest .. "*"
   local found          = false
 
-  log_debug("searching in list processes:",
+  log_debug("Searching in process list",
             "for digest:", digest,
             "cursor:", process_cursor)
 
@@ -15,15 +15,26 @@ local function find_digest_in_process_set(digest)
     log_debug("Found number of processes:", #processes, "next cursor:", next_process_cursor)
 
     for _, process in ipairs(processes) do
+      local workers_key = process .. ":workers"
       log_debug("searching in process set:", process,
                 "for digest:", digest,
                 "cursor:", process_cursor)
 
-      local job = redis.call("HGET", process, "info")
+      local jobs = redis.call("HGETALL", workers_key)
 
-      if string.find(job, digest) then
-        log_debug("Found digest", digest, "in process:", process)
-        found = true
+      if #jobs == 0 then
+        log_debug("No entries in:", workers_key)
+      else
+        for i = 1, #jobs, 2 do
+          if string.find(jobs[i +1], digest) then
+            log_debug("Found digest", digest, "in:", workers_key)
+            found = true
+            break
+          end
+        end
+      end
+
+      if found == true then
         break
       end
     end

data/lib/sidekiq_unique_jobs/middleware.rb

@@ -4,7 +4,7 @@ module SidekiqUniqueJobs
   #
   # Provides the sidekiq middleware that makes the gem work
   #
-  # @author Mikael Henriksson <mikael@zoolutions.se>
+  # @author Mikael Henriksson <mikael@mhenrixon.com>
   #
   module Middleware
     include SidekiqUniqueJobs::Logging::Middleware
@@ -25,11 +25,19 @@ module SidekiqUniqueJobs
     def self.configure_server # rubocop:disable Metrics/MethodLength
       Sidekiq.configure_server do |config|
         config.client_middleware do |chain|
-          chain.add SidekiqUniqueJobs::Middleware::Client
+          if defined?(Apartment::Sidekiq::Middleware::Client)
+            chain.insert_after Apartment::Sidekiq::Middleware::Client, SidekiqUniqueJobs::Middleware::Client
+          else
+            chain.add SidekiqUniqueJobs::Middleware::Client
+          end
         end
 
         config.server_middleware do |chain|
-          chain.add SidekiqUniqueJobs::Middleware::Server
+          if defined?(Apartment::Sidekiq::Middleware::Server)
+            chain.insert_after Apartment::Sidekiq::Middleware::Server, SidekiqUniqueJobs::Middleware::Server
+          else
+            chain.add SidekiqUniqueJobs::Middleware::Server
+          end
         end
 
         config.on(:startup) do
@@ -51,7 +59,11 @@ module SidekiqUniqueJobs
     def self.configure_client
       Sidekiq.configure_client do |config|
         config.client_middleware do |chain|
-          chain.add SidekiqUniqueJobs::Middleware::Client
+          if defined?(Apartment::Sidekiq::Middleware::Client)
+            chain.insert_after Apartment::Sidekiq::Middleware::Client, SidekiqUniqueJobs::Middleware::Client
+          else
+            chain.add SidekiqUniqueJobs::Middleware::Client
+          end
         end
       end
     end

data/lib/sidekiq_unique_jobs/middleware/client.rb

@@ -4,7 +4,7 @@ module SidekiqUniqueJobs
   module Middleware
     # The unique sidekiq middleware for the client push
     #
-    # @author Mikael Henriksson <mikael@zoolutions.se>
+    # @author Mikael Henriksson <mikael@mhenrixon.com>
     class Client
       prepend SidekiqUniqueJobs::Middleware
 
@@ -18,15 +18,15 @@ module SidekiqUniqueJobs
       #
       # @yield when uniqueness is disable
       # @yield when the lock is successful
-      def call(*)
-        lock { yield }
+      def call(*, &block)
+        lock(&block)
       end
 
       private
 
       def lock
-        if (token = lock_instance.lock)
-          yield token
+        if (_token = lock_instance.lock)
+          yield
         else
           warn_about_duplicate
         end

data/lib/sidekiq_unique_jobs/middleware/server.rb

@@ -4,7 +4,7 @@ module SidekiqUniqueJobs
   module Middleware
     # The unique sidekiq middleware for the server processor
     #
-    # @author Mikael Henriksson <mikael@zoolutions.se>
+    # @author Mikael Henriksson <mikael@mhenrixon.com>
     class Server
       prepend SidekiqUniqueJobs::Middleware
 
@@ -19,8 +19,8 @@ module SidekiqUniqueJobs
       #
       # @yield when uniqueness is disabled
       # @yield when owning the lock
-      def call(*)
-        lock_instance.execute { yield }
+      def call(*, &block)
+        lock_instance.execute(&block)
       end
     end
   end