sidekiq-unique-jobs 3.0.10 → 3.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a49b8c44e5f5a0fb1e1c61e577d7b070a079c320
-  data.tar.gz: 56e5652f44f26b9580634ea31a9a45c555dabf56
+  metadata.gz: 58ca57b1c96449ad911a8877213042e5841fed6a
+  data.tar.gz: ad3c813df8ea6af8fe777b5159486aef110c14ae
 SHA512:
-  metadata.gz: ab05836a9982011714d1ab9b7d2de17d178a82c6bce9259f6921d2ae83e889cc66ee135485b8de88ce653fac18cdbb1a1e68c3ebe23c51044d0f15897775074c
-  data.tar.gz: 2f6f2fc4ec79821e3447a41402169ff1633f36e56855f268b5de70477fe57424eb5b82a8de5b57a98e5c233c83069561e7b364b46f9df785dfc6af89d0c58c40
+  metadata.gz: 48b85b8f6126bc57dd6456842f55f160bdc94f0b6937197b9b03669dca4b4b67c1a22b131312439f20a485a159a3f2981ec09d4044eace8a00b4c17d044d1bfa
+  data.tar.gz: fcfd18f652ce9ca72db065a433401b9eb0e936700707186c53796200a2a2468a3d62aadc099ce424a14fad0972085c624d4cc8f82a45f263672a6909d756c740

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## v3.0.11
+- Ensure threadsafety (thanks to adstage-david)
+
 ## v3.0.9
 - Fixed that all jobs stopped processing
 

data/README.md

@@ -111,3 +111,4 @@ SidekiqUniqueJobs uses mock_redis for inline testing. Due to complaints about ha
 - https://github.com/sax
 - https://github.com/eduardosasso
 - https://github.com/KensoDev
+- https://github.com/adstage-david

data/lib/sidekiq_unique_jobs/connectors.rb

@@ -6,10 +6,10 @@ module SidekiqUniqueJobs
   module Connectors
     CONNECTOR_TYPES = [Testing, RedisPool, SidekiqRedis]
 
-    def self.conn(redis_pool = nil)
+    def self.connection(redis_pool = nil, &block)
       CONNECTOR_TYPES.each do |connector|
-        conn = connector.conn(redis_pool)
-        return conn if conn
+        had_connection = connector.connection(redis_pool, &block)
+        return if had_connection
       end
     end
   end

data/lib/sidekiq_unique_jobs/connectors/redis_pool.rb

@@ -1,9 +1,10 @@
 module SidekiqUniqueJobs
   module Connectors
     class RedisPool
-      def self.conn(redis_pool = nil)
+      def self.connection(redis_pool = nil, &block)
         return if redis_pool.nil?
-        redis_pool.with { |conn| conn }
+        redis_pool.with(&block)
+        true
       end
     end
   end

data/lib/sidekiq_unique_jobs/connectors/sidekiq_redis.rb

@@ -1,8 +1,8 @@
 module SidekiqUniqueJobs
   module Connectors
     class SidekiqRedis
-      def self.conn(_redis_pool = nil)
-        Sidekiq.redis { |conn| conn }
+      def self.connection(_redis_pool = nil, &block)
+        Sidekiq.redis(&block)
       end
     end
   end

data/lib/sidekiq_unique_jobs/connectors/testing.rb

@@ -1,9 +1,10 @@
 module SidekiqUniqueJobs
   module Connectors
     class Testing
-      def self.conn(_redis_pool = nil)
+      def self.connection(_redis_pool = nil)
         return unless SidekiqUniqueJobs.config.testing_enabled?
-        SidekiqUniqueJobs.redis_mock { |conn| conn }
+        yield SidekiqUniqueJobs.redis_mock
+        true
       end
     end
   end

data/lib/sidekiq_unique_jobs/middleware.rb

@@ -9,7 +9,6 @@ Sidekiq.configure_server do |config|
     require 'sidekiq_unique_jobs/middleware/client/unique_jobs'
     chain.add SidekiqUniqueJobs::Middleware::Client::UniqueJobs
   end
-
 end
 
 Sidekiq.configure_client do |config|

data/lib/sidekiq_unique_jobs/middleware/client/strategies/unique.rb

@@ -31,31 +31,35 @@ module SidekiqUniqueJobs
 
           attr_reader :item, :worker_class, :redis_pool, :queue
 
+          # rubocop:disable MethodLength
           def unique_for_connection?
             unique = false
-            conn.watch(payload_hash)
+            connection do |conn|
+              conn.watch(payload_hash)
 
-            if conn.get(payload_hash).to_i == 1 ||
-               (conn.get(payload_hash).to_i == 2 && item['at'])
-              # if the job is already queued, or is already scheduled and
-              # we're trying to schedule again, abort
-              conn.unwatch
-            else
-              # if the job was previously scheduled and is now being queued,
-              # or we've never seen it before
-              expires_at = unique_job_expiration || SidekiqUniqueJobs.config.default_expiration
-              expires_at = ((Time.at(item['at']) - Time.now.utc) + expires_at).to_i if item['at']
+              if conn.get(payload_hash).to_i == 1 ||
+                 (conn.get(payload_hash).to_i == 2 && item['at'])
+                # if the job is already queued, or is already scheduled and
+                # we're trying to schedule again, abort
+                conn.unwatch
+              else
+                # if the job was previously scheduled and is now being queued,
+                # or we've never seen it before
+                expires_at = unique_job_expiration || SidekiqUniqueJobs.config.default_expiration
+                expires_at = ((Time.at(item['at']) - Time.now.utc) + expires_at).to_i if item['at']
 
-              unique = conn.multi do
-                # set value of 2 for scheduled jobs, 1 for queued jobs.
-                conn.setex(payload_hash, expires_at, item['at'] ? 2 : 1)
+                unique = conn.multi do
+                  # set value of 2 for scheduled jobs, 1 for queued jobs.
+                  conn.setex(payload_hash, expires_at, item['at'] ? 2 : 1)
+                end
               end
             end
             unique
           end
+          # rubocop:enable MethodLength
 
-          def conn
-            SidekiqUniqueJobs::Connectors.conn(redis_pool)
+          def connection(&block)
+            SidekiqUniqueJobs::Connectors.connection(redis_pool, &block)
           end
 
           def payload_hash

data/lib/sidekiq_unique_jobs/middleware/server/unique_jobs.rb

@@ -53,15 +53,15 @@ module SidekiqUniqueJobs
         end
 
         def unlock(payload_hash)
-          conn.del(payload_hash)
+          connection { |c| c.del(payload_hash) }
         end
 
         def logger
           Sidekiq.logger
         end
 
-        def conn
-          SidekiqUniqueJobs::Connectors.conn(redis_pool)
+        def connection(&block)
+          SidekiqUniqueJobs::Connectors.connection(redis_pool, &block)
         end
       end
     end

data/lib/sidekiq_unique_jobs/version.rb

@@ -1,3 +1,3 @@
 module SidekiqUniqueJobs
-  VERSION = '3.0.10'
+  VERSION = '3.0.11'
 end

data/spec/lib/client_spec.rb

@@ -150,7 +150,6 @@ describe 'Client' do
           expect(q2_length).to eq 0
         end
       end
-
     end
 
     # TODO: If anyone know of a better way to check that the expiration for scheduled

data/spec/lib/sidekiq_testing_enabled_spec.rb

@@ -29,7 +29,6 @@ describe 'When Sidekiq::Testing is enabled' do
     end
 
     context 'with non-unique worker' do
-
       it 'pushes duplicates messages' do
         param = 'work'
         expect(MyWorker.jobs.size).to eq(0)
@@ -120,6 +119,5 @@ describe 'When Sidekiq::Testing is enabled' do
         expect(TestClass).to have_received(:run).with(1).twice
       end
     end
-
   end
 end

data/spec/lib/sidekiq_unique_ext_spec.rb

@@ -15,7 +15,6 @@ class JustAWorker
 end
 
 describe Sidekiq::Job::UniqueExtension do
-
   before do
     Sidekiq.redis = REDIS
     Sidekiq.redis(&:flushdb)
@@ -35,7 +34,6 @@ describe Sidekiq::Job::UniqueExtension do
 end
 
 describe Sidekiq::Queue::UniqueExtension do
-
   before do
     Sidekiq.redis = REDIS
     Sidekiq.redis(&:flushdb)
@@ -54,7 +52,6 @@ describe Sidekiq::Queue::UniqueExtension do
 end
 
 describe Sidekiq::JobSet::UniqueExtension, sidekiq_ver: 3 do
-
   before do
     Sidekiq.redis = REDIS
     Sidekiq.redis(&:flushdb)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-unique-jobs
 version: !ruby/object:Gem::Version
-  version: 3.0.10
+  version: 3.0.11
 platform: ruby
 authors:
 - Mikael Henriksson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2014-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq