sidekiq-middleware 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f349d0be192e15acd3e7583662a4011e858b80f1
-  data.tar.gz: 70041e4a2eb69940fa1ae24fa89339d06d13b733
+  metadata.gz: f04e949a14e7c6eaf7d746573daebbf25ec154f1
+  data.tar.gz: 8de3085809a52b856ad510a9cab0c8d2abb51144
 SHA512:
-  metadata.gz: 77faf9f4982d9cd4c7334ed3368e356192fec79e893c82e643a4597230ebf91dbc7f028321d0d7c3a6120e8cd317b2c8808431d277a89c63ab6c6ea454ef386a
-  data.tar.gz: f660c82eaddfad7ba5b6ecaedc94700e63cfcd4a0d784a4a37bce265c3ebfbdafa62b8b55e6a58a64d20f68837830459ec7e7c2a72d94db365b8134efbbec140
+  metadata.gz: 39b268d9dfbd5c1b95171ff061ac0ed5dc99f803c166baf753b60bc0f58fbaadf07eb76a6a25f6b34cc1532acf04bfea909118edfc286a4efcae92f428319975
+  data.tar.gz: c1b11188de319b8444aa07ce074a9b66a111225bbd7bb00c4cd0b392005e1696417cb95fd17b8cd620c076a1856b8f77a4d5afce5515ff757276cd6a5e2302ce

data/CHANGES.md

@@ -1,3 +1,8 @@
+0.1.4
+-----------
+
+- Make sure that scheduled unique jobs correctly move from the queue to work ([Sutto](https://github.com/Sutto))
+
 0.1.3
 -----------
 

data/lib/sidekiq-middleware/client/unique_jobs.rb

@@ -12,6 +12,7 @@ module Sidekiq
 
           if enabled
             unique, payload = false, item.clone.slice(*%w(class queue args at))
+            job_id = item['jid']
 
             # Enabled unique scheduled
             if enabled == :all && payload.has_key?('at')
@@ -26,11 +27,12 @@ module Sidekiq
             Sidekiq.redis do |conn|
               conn.watch(payload_hash)
 
-              if conn.get(payload_hash)
+              locked_job_id = conn.get(payload_hash)
+              if locked_job_id && locked_job_id != job_id
                 conn.unwatch
               else
                 unique = conn.multi do
-                  conn.setex(payload_hash, expiration, 1)
+                  conn.setex(payload_hash, expiration, job_id)
                 end
               end
             end

data/lib/sidekiq-middleware/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Middleware
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end

data/sidekiq-middleware.gemspec

@@ -14,8 +14,9 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Sidekiq::Middleware::VERSION
 
-  gem.add_dependency                  'sidekiq',  '~> 2.12.4'
+  gem.add_dependency                  'sidekiq',  '>= 2.12.4', '< 3'
   gem.add_development_dependency      'rake'
   gem.add_development_dependency      'bundler',  '~> 1.0'
   gem.add_development_dependency      'minitest', '~> 3'
+  gem.add_development_dependency      'timecop'
 end

data/test/test_unique_jobs.rb

@@ -1,5 +1,6 @@
 require 'securerandom'
 require 'helper'
+require 'timecop'
 require 'sidekiq/client'
 require 'sidekiq/worker'
 require 'sidekiq/processor'
@@ -8,6 +9,7 @@ require 'sidekiq-middleware'
 class TestUniqueJobs < MiniTest::Unit::TestCase
   describe 'with real redis' do
     before do
+      Celluloid.boot
       @boss = MiniTest::Mock.new
       @processor = ::Sidekiq::Processor.new(@boss)
 
@@ -73,6 +75,19 @@ class TestUniqueJobs < MiniTest::Unit::TestCase
       assert_equal 1, Sidekiq.redis { |c| c.zcard('schedule') }
     end
 
+    it 'does correctly handle adding to the worker queue when scheduled' do
+      start_time = Time.now - 60
+      queue_time = start_time + 30
+      Timecop.travel start_time do
+        UniqueScheduledWorker.perform_at queue_time, 'x'
+      end
+      assert_equal 1, Sidekiq.redis { |c| c.zcard('schedule') }
+      assert_equal 0, Sidekiq.redis { |c| c.llen('queue:unique_scheduled_queue') }
+      Sidekiq::Scheduled::Poller.new.poll
+      assert_equal 0, Sidekiq.redis { |c| c.zcard('schedule') }
+      assert_equal 1, Sidekiq.redis { |c| c.llen('queue:unique_scheduled_queue') }
+    end
+
     it 'allows the job to be re-scheduled after processing' do
       # Schedule
       5.times { |t| UniqueScheduledWorker.perform_in((t+1)*60, 'args') }
@@ -114,7 +129,9 @@ class TestUniqueJobs < MiniTest::Unit::TestCase
     it 'does not duplicate messages with enabled unique option and custom unique lock key' do
       5.times { CustomUniqueWorker.perform_async('args', false) }
       assert_equal 1, Sidekiq.redis { |c| c.llen('queue:custom_unique_queue') }
-      assert_equal 1, Sidekiq.redis { |c| c.get('custom:unique:lock:args').to_i }
+      job = Sidekiq.load_json Sidekiq.redis { |c| c.lpop('queue:custom_unique_queue') }
+      assert job['jid']
+      assert_equal job['jid'], Sidekiq.redis { |c| c.get('custom:unique:lock:args') }
     end
 
     it 'does not allow the job to be duplicated when processing job with manual option' do
@@ -155,5 +172,6 @@ class TestUniqueJobs < MiniTest::Unit::TestCase
       }
       assert_equal 5, Sidekiq.redis { |c| c.zcard('schedule') }
     end
+
   end
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-middleware
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Dmitry Krasnoukhov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-22 00:00:00.000000000 Z
+date: 2013-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.12.4
+    - - <
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.12.4
+    - - <
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +72,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Additional sidekiq middleware
 email:
 - dmitry@krasnoukhov.com