sidekiq-unique-jobs 7.1.0 → 7.1.5

data/lib/sidekiq_unique_jobs/config.rb

@@ -116,8 +116,8 @@ module SidekiqUniqueJobs
     REAPER_RESURRECTOR_INTERVAL = 3600
 
     #
-    # @return [true] enable reaper resurrector
-    REAPER_RESURRECTOR_ENABLED = true
+    # @return [false] enable reaper resurrector
+    REAPER_RESURRECTOR_ENABLED = false
 
     #
     # @return [false] while useful it also adds overhead so disable lock_info by default

data/lib/sidekiq_unique_jobs/lock_config.rb

@@ -59,8 +59,8 @@ module SidekiqUniqueJobs
     def initialize(job_hash = {})
       @type        = job_hash[LOCK]&.to_sym
       @worker      = SidekiqUniqueJobs.safe_constantize(job_hash[CLASS])
-      @limit       = job_hash.fetch(LOCK_LIMIT, 1)
-      @timeout     = job_hash.fetch(LOCK_TIMEOUT, 0)
+      @limit       = job_hash.fetch(LOCK_LIMIT, 1)&.to_i
+      @timeout     = job_hash.fetch(LOCK_TIMEOUT, 0)&.to_i
       @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 }
@@ -79,10 +79,10 @@ module SidekiqUniqueJobs
     # Indicate if timeout was set
     #
     #
-    # @return [true,fakse]
+    # @return [true,false]
     #
     def wait_for_lock?
-      timeout && (timeout.zero? || timeout.positive?)
+      timeout.nil? || timeout.positive?
     end
 
     #

data/lib/sidekiq_unique_jobs/locksmith.rb

@@ -179,6 +179,9 @@ module SidekiqUniqueJobs
     #
     # Used to reduce some duplication from the two methods
     #
+    # @see lock
+    # @see execute
+    #
     # @param [Sidekiq::RedisConnection, ConnectionPool] conn the redis connection
     # @param [Method] primed_method reference to the method to use for getting a primed token
     #
@@ -238,7 +241,7 @@ module SidekiqUniqueJobs
     def primed_async(conn, wait = nil, &block)
       primed_jid = Concurrent::Promises
                    .future(conn) { |red_con| pop_queued(red_con, wait) }
-                   .value(add_drift(wait || config.ttl))
+                   .value(add_drift(wait || config.timeout))
 
       handle_primed(primed_jid, &block)
     end
@@ -271,18 +274,21 @@ module SidekiqUniqueJobs
     # @return [String] a previously enqueued token (now taken off the queue)
     #
     def pop_queued(conn, wait = nil)
-      if wait || config.wait_for_lock?
-        brpoplpush(conn, wait)
-      else
+      wait ||= config.timeout if config.wait_for_lock?
+
+      if wait.nil?
         rpoplpush(conn)
+      else
+        brpoplpush(conn, wait)
       end
     end
 
     #
     # @api private
     #
-    def brpoplpush(conn, wait = nil)
-      wait ||= config.timeout
+    def brpoplpush(conn, wait)
+      raise InvalidArgument, "wait must be an integer" unless wait.is_a?(Integer)
+
       # passing timeout 0 to brpoplpush causes it to block indefinitely
       conn.brpoplpush(key.queued, key.primed, timeout: wait)
     end

data/lib/sidekiq_unique_jobs/timing.rb

@@ -51,7 +51,7 @@ module SidekiqUniqueJobs
       if Process.const_defined?("CLOCK_MONOTONIC")
         Process.clock_gettime(Process::CLOCK_MONOTONIC)
       else
-        Time.now.to_f
+        now_f
       end
     end
   end

data/lib/sidekiq_unique_jobs/version.rb

@@ -3,5 +3,5 @@
 module SidekiqUniqueJobs
   #
   # @return [String] the current SidekiqUniqueJobs version
-  VERSION = "7.1.0"
+  VERSION = "7.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-unique-jobs
 version: !ruby/object:Gem::Version
-  version: 7.1.0
+  version: 7.1.5
 platform: ruby
 authors:
 - Mikael Henriksson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-29 00:00:00.000000000 Z
+date: 2021-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: brpoplpush-redis_script
@@ -261,7 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.21
+rubygems_version: 3.2.24
 signing_key:
 specification_version: 4
 summary: Sidekiq middleware that prevents duplicates jobs