sidekiq-unique-jobs 5.0.4 → 5.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11b1c4aca9391461a5744ff361b1bd1d549a5d1e
-  data.tar.gz: d336770bd8f907edab6805a2f394b4d2bc26ef08
+  metadata.gz: 8f35cb3be6bdca4175e0c98f2a2ea068d2d35b26
+  data.tar.gz: b1e359ad759c2db79f8bda05daaf8f04ea392124
 SHA512:
-  metadata.gz: 87ac16889831fe0a6c072091cc4becc17e1e988867c8474788bf8f3d369ff2f6b83519b563080761727ffc13e9dd1b1559daf761779019fbcb1a8225c129299e
-  data.tar.gz: ecc7c5c08bfa9f2aab973e30d6ad3c044de0a8da5bd5a6b39c87273509b758795882c8a1ee0707d5c8fb31c776f725210dbe8029c9c96d8c13ca08478df5b643
+  metadata.gz: 9f82651ba910aa23ff9dc5d291a44640290860fd9ef43281fcd4cb41eabad5e997dc495b54547b5341271acd7d3e36c06dc8eaca68015bdb5706468ff234919c
+  data.tar.gz: a338ce8b7b65dbca292b0665aadf7fb3df43e00eaf341c2ebb96b13e36c525d033c074648e125c55566ab99c0b4d38cbf0674519b6b9573ec7d38cd3d436e365

data/.gitignore

@@ -14,3 +14,5 @@ tmp/
 rails_example/spec/examples.txt
 
 *.sublime-*
+
+/sidekiq/

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## v5.0.5
+- Use a class level mutex for `while_executing`
+
 ## v5.0.4
 - Fixes a problem with installing the gem
 

data/README.md

@@ -135,7 +135,7 @@ The method or the proc can return a modified version of args without the transie
 ```ruby
 class UniqueJobWithFilterMethod
   include Sidekiq::Worker
-  sidekiq_options unique: :until_and_while_execution,
+  sidekiq_options unique: :until_and_while_executing,
                   unique_args: :unique_args
 
   def self.unique_args(name, id, options)

data/lib/sidekiq-unique-jobs.rb

@@ -51,7 +51,7 @@ module SidekiqUniqueJobs
   end
 
   def namespace
-    @namespace ||= connection { |c| c.respond_to?(:namespace) ? c.namespace : nil }
+    @namespace ||= connection { |conn| conn.respond_to?(:namespace) ? conn.namespace : nil }
   end
 
   # Attempt to constantize a string worker_class argument, always
@@ -68,7 +68,7 @@ module SidekiqUniqueJobs
   end
 
   def redis_version
-    @redis_version ||= connection { |c| c.info('server')['redis_version'] }
+    @redis_version ||= connection { |conn| conn.info('server')['redis_version'] }
   end
 
   def connection(redis_pool = nil)

data/lib/sidekiq_unique_jobs/lock/while_executing.rb

@@ -3,19 +3,20 @@
 module SidekiqUniqueJobs
   module Lock
     class WhileExecuting
+      MUTEX = Mutex.new
+
       def self.synchronize(item, redis_pool = nil)
         new(item, redis_pool).synchronize { yield }
       end
 
       def initialize(item, redis_pool = nil)
         @item = item
-        @mutex = Mutex.new
         @redis_pool = redis_pool
         @unique_digest = "#{create_digest}:run"
       end
 
       def synchronize
-        @mutex.lock
+        MUTEX.lock
         sleep 0.1 until locked?
 
         yield
@@ -23,8 +24,8 @@ module SidekiqUniqueJobs
         logger.fatal { "the unique_key: #{@unique_digest} needs to be unlocked manually" }
         raise
       ensure
-        SidekiqUniqueJobs.connection(@redis_pool) { |c| c.del @unique_digest }
-        @mutex.unlock
+        SidekiqUniqueJobs.connection(@redis_pool) { |conn| conn.del @unique_digest }
+        MUTEX.unlock
       end
 
       def locked?

data/lib/sidekiq_unique_jobs/script_mock.rb

@@ -15,46 +15,46 @@ module SidekiqUniqueJobs
     end
 
     def acquire_lock(redis_pool, options = {})
-      connection(redis_pool) do |redis|
+      connection(redis_pool) do |conn|
         unique_key = options[:keys][0]
         job_id     = options[:argv][0]
         expires    = options[:argv][1].to_i
-        stored_jid = redis.get(unique_key)
+        stored_jid = conn.get(unique_key)
 
         return (stored_jid == job_id) ? 1 : 0 if stored_jid
 
-        return 0 unless redis.set(unique_key, job_id, nx: true, ex: expires)
-        redis.hsetnx(SidekiqUniqueJobs::HASH_KEY, job_id, unique_key)
+        return 0 unless conn.set(unique_key, job_id, nx: true, ex: expires)
+        conn.hsetnx(SidekiqUniqueJobs::HASH_KEY, job_id, unique_key)
         return 1
       end
     end
 
     def release_lock(redis_pool, options = {})
-      connection(redis_pool) do |redis|
+      connection(redis_pool) do |conn|
         unique_key = options[:keys][0]
         job_id     = options[:argv][0]
-        stored_jid = redis.get(unique_key)
+        stored_jid = conn.get(unique_key)
 
         return -1 unless stored_jid
         return 0 unless stored_jid == job_id || stored_jid == '2'
 
-        redis.del(unique_key)
-        redis.hdel(SidekiqUniqueJobs::HASH_KEY, job_id)
+        conn.del(unique_key)
+        conn.hdel(SidekiqUniqueJobs::HASH_KEY, job_id)
         return 1
       end
     end
 
     def synchronize(redis_pool, options = {})
-      connection(redis_pool) do |redis|
+      connection(redis_pool) do |conn|
         unique_key = options[:keys][0]
         time       = options[:argv][0].to_i
         expires    = options[:argv][1].to_f
 
-        return 1 if redis.set(unique_key, time + expires, nx: true, ex: expires)
+        return 1 if conn.set(unique_key, time + expires, nx: true, ex: expires)
 
-        stored_time = redis.get(unique_key)
+        stored_time = conn.get(unique_key)
         if stored_time && stored_time < time
-          if redis.set(unique_key, time + expires, xx: true, ex: expires)
+          if conn.set(unique_key, time + expires, xx: true, ex: expires)
             return 1
           end
         end

data/lib/sidekiq_unique_jobs/scripts.rb

@@ -31,9 +31,9 @@ module SidekiqUniqueJobs
     end
 
     def internal_call(file_name, redis_pool, options = {})
-      connection(redis_pool) do |redis|
-        SCRIPT_SHAS[file_name] = redis.script(:load, script_source(file_name)) if SCRIPT_SHAS[file_name].nil?
-        redis.evalsha(SCRIPT_SHAS[file_name], options)
+      connection(redis_pool) do |conn|
+        SCRIPT_SHAS[file_name] = conn.script(:load, script_source(file_name)) if SCRIPT_SHAS[file_name].nil?
+        conn.evalsha(SCRIPT_SHAS[file_name], options)
       end
     end
 

data/lib/sidekiq_unique_jobs/unlockable.rb

@@ -18,7 +18,7 @@ module SidekiqUniqueJobs
     end
 
     def ensure_job_id_removed(jid)
-      Sidekiq.redis { |redis| redis.hdel(SidekiqUniqueJobs::HASH_KEY, jid) }
+      Sidekiq.redis { |conn| conn.hdel(SidekiqUniqueJobs::HASH_KEY, jid) }
     end
 
     def logger

data/lib/sidekiq_unique_jobs/util.rb

@@ -14,8 +14,8 @@ module SidekiqUniqueJobs
     end
 
     def unique_key(jid)
-      connection do |redis|
-        redis.hget(SidekiqUniqueJobs::HASH_KEY, jid)
+      connection do |conn|
+        conn.hget(SidekiqUniqueJobs::HASH_KEY, jid)
       end
     end
 

data/lib/sidekiq_unique_jobs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SidekiqUniqueJobs
-  VERSION = '5.0.4'
+  VERSION = '5.0.5'
 end

data/sidekiq-unique-jobs.gemspec

@@ -13,20 +13,20 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/mhenrixon/sidekiq-unique-jobs'
   spec.license       = 'MIT'
 
-  spec.bindir        = "bin"
+  spec.bindir        = 'bin'
   spec.executables   = %w[jobs]
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features|gemfiles|pkg|rails_example|tmp)/})
   end
 
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
   spec.add_dependency 'sidekiq', '>= 4.0', '<= 6.0'
   spec.add_dependency 'thor', '~> 0'
 
   spec.add_development_dependency 'rspec', '~> 3.1'
-  spec.add_development_dependency 'rake', '~> 12.0', '~> 0'
+  spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'timecop', '~> 0.8'
-  spec.add_development_dependency 'yard', '~> 0.9.8'
-  spec.add_development_dependency 'gem-release', '~> 0.7.4'
+  spec.add_development_dependency 'yard', '~> 0.9'
+  spec.add_development_dependency 'gem-release', '~> 0.7'
   spec.add_development_dependency 'codeclimate-test-reporter', '~> 1.0', '>= 1.0.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-unique-jobs
 version: !ruby/object:Gem::Version
-  version: 5.0.4
+  version: 5.0.5
 platform: ruby
 authors:
 - Mikael Henriksson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-18 00:00:00.000000000 Z
+date: 2017-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -65,9 +65,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '12.0'
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -75,9 +72,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '12.0'
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -98,28 +92,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.8
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.8
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: gem-release
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.4
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.4
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement