sidekiq-unique-jobs 6.0.19 → 6.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e7339c3de1638fdd81aa8d3b90d0d09a6a18caa35fc0452efb97464853b4d3f
-  data.tar.gz: 40a8a95a053e13b2bee8fc34ecd7d684d24e9b109f00412bc0f72952d71c6386
+  metadata.gz: 288a4e4d37ce0e15a36fe7dcf2a3ec4e32c46d6c7ab485eca03a9629d017e067
+  data.tar.gz: 1b9b2440e309eb62590efedb501d3dddddb798a2a03be05a6253686918c3f93d
 SHA512:
-  metadata.gz: 2c2c01161c61bf276964c68d637352769e31d02c10bcc7ae378731797c5729ef6f72c9dcfc0eaebc670143e3355703aa2869e13bda222a0251e2149e614d27c6
-  data.tar.gz: ed733e7b12b9411ace00f2c5161e3c7c84ca039988dade9cff4900cdf01c45e42a99d565b4abcd76ce6302ba26e1818bf4fb954ec357f9d98229e4bb37098a48
+  metadata.gz: efe7a753947bf3918220c8a5e4efcbe927a8a4ee4e55067cffc4a1399f481376612562a054a4b696e42210b8c261d3df2dd6d2efa94f69cd5495063d5d77722c
+  data.tar.gz: a1b598b4e7c35cbcae3ace905fb3df517cb81981e0f1595cdb454bf439f35b5b6e6381a6c2f05ca00043ae13f01751435b67d65651afe51999d6b77834332eba

data/lib/sidekiq_unique_jobs/cli.rb

@@ -46,16 +46,21 @@ module SidekiqUniqueJobs
 
     no_commands do
       def console_class
-        if RUBY_PLATFORM == "JAVA"
-          require "irb"
-          return IRB
-        end
+        return irb if RUBY_PLATFORM == "JAVA"
 
+        pry
+      end
+
+      def irb
+        require "irb"
+        IRB
+      end
+
+      def pry
         require "pry"
         Pry
       rescue LoadError, NameError
-        require "irb"
-        IRB
+        irb
       end
     end
   end

data/lib/sidekiq_unique_jobs/constants.rb

@@ -11,8 +11,10 @@ module SidekiqUniqueJobs
   CLASS_KEY                 ||= "class"
   JAVA                      ||= "java"
   JID_KEY                   ||= "jid"
+  LOCK_DIGEST_KEY           ||= "lock_digest"
   LOCK_EXPIRATION_KEY       ||= "lock_expiration"
   LOCK_TIMEOUT_KEY          ||= "lock_timeout"
+  LOCK_TTL_KEY              ||= "lock_ttl"
   LOG_DUPLICATE_KEY         ||= "log_duplicate_payload"
   QUEUE_KEY                 ||= "queue"
   UNIQUE_ACROSS_QUEUES_KEY  ||= "unique_across_queues"

data/lib/sidekiq_unique_jobs/locksmith.rb

@@ -15,9 +15,9 @@ module SidekiqUniqueJobs
     # @param [Sidekiq::RedisConnection, ConnectionPool] redis_pool the redis connection
     def initialize(item, redis_pool = nil)
       # @concurrency   = 1 # removed in a0cff5bc42edbe7190d6ede7e7f845074d2d7af6
-      @ttl           = item[LOCK_EXPIRATION_KEY]
+      @ttl           = item[LOCK_EXPIRATION_KEY] || item[LOCK_TTL_KEY]
       @jid           = item[JID_KEY]
-      @unique_digest = item[UNIQUE_DIGEST_KEY]
+      @unique_digest = item[UNIQUE_DIGEST_KEY] || item[LOCK_DIGEST_KEY]
       @lock_type     = item[LOCK_KEY] || item[UNIQUE_KEY]
       @lock_type   &&= @lock_type.to_sym
       @redis_pool    = redis_pool

data/lib/sidekiq_unique_jobs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SidekiqUniqueJobs
-  VERSION = "6.0.19"
+  VERSION = "6.0.20"
 end

data/redis/lock.lua

@@ -49,7 +49,8 @@ redis.call('RPUSH', available_key, job_id)
 
 -- The client should only set ttl for until_expired
 -- The server should set ttl for all other jobs
-if lock == "until_expired" and ttl then
+-- redis.log(redis.LOG_WARNING, "lock: " .. lock .. ", ttl: " .. tostring(ttl))
+if lock == "until_expired" and ttl and ttl > 0 then
   -- We can't keep the key here because it will otherwise never be deleted
   redis.call('SREM', unique_keys, unique_digest)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-unique-jobs
 version: !ruby/object:Gem::Version
-  version: 6.0.19
+  version: 6.0.20
 platform: ruby
 authors:
 - Mikael Henriksson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-21 00:00:00.000000000 Z
+date: 2020-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby