resque-lonely_job 0.0.3 → 0.0.4

data/lib/resque-lonely_job.rb

@@ -6,7 +6,7 @@ module Resque
       LOCK_TIMEOUT = 60 * 60 * 24 * 5 # 5 days
 
       def lock_timeout
-        Time.now.utc + LOCK_TIMEOUT + 1
+        Time.now.to_i + LOCK_TIMEOUT + 1
       end
 
       # Overwrite this method to uniquely identify which mutex should be used
@@ -16,7 +16,15 @@ module Resque
       end
 
       def can_lock_queue?(*args)
-        Resque.redis.setnx(redis_key(*args), lock_timeout)
+        now = Time.now.to_i
+        key = redis_key(*args)
+        timeout = lock_timeout
+
+        # Per http://redis.io/commands/setnx
+        return true  if Resque.redis.setnx(key, timeout)
+        return false if Resque.redis.get(key).to_i > now
+        return true  if Resque.redis.getset(key, timeout).to_i <= now
+        return false
       end
 
       def unlock_queue(*args)

data/lib/resque-lonely_job/version.rb

@@ -1,7 +1,7 @@
 module Resque
   module Plugins
     module LonelyJob
-      VERSION = "0.0.3"
+      VERSION = "0.0.4"
     end
   end
 end

data/resque-lonely_job.gemspec

@@ -14,11 +14,12 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Resque::Plugins::LonelyJob::VERSION
 
-  gem.add_dependency 'resque', '~> 1.20.0'
+  gem.add_dependency 'resque', '>= 1.20.0'
   gem.add_development_dependency 'mock_redis', '~> 0.4.1'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'debugger'
+  gem.add_development_dependency 'timecop'
 
   gem.description   = <<desc
 Ensures that for a given queue, only one worker is working on a job at any given time.

data/spec/lib/lonely_job_spec.rb

@@ -32,6 +32,37 @@ describe Resque::Plugins::LonelyJob do
       SerialJob.can_lock_queue?(:serial_work).should be_true
       SerialJob.can_lock_queue?(:serial_work).should be_false
     end
+
+    it 'cannot lock a queue with active lock' do
+      SerialJob.can_lock_queue?(:serial_work).should be_true
+      Timecop.travel(Date.today + 1) do
+        SerialJob.can_lock_queue?(:serial_work).should be_false
+      end
+    end
+
+    it 'can relock a queue with expired lock' do
+      SerialJob.can_lock_queue?(:serial_work).should be_true
+
+      Timecop.travel(Date.today + 10) do
+        SerialJob.can_lock_queue?(:serial_work).should be_true
+      end
+    end
+
+    it 'solves race condition with getset' do
+      SerialJob.can_lock_queue?(:serial_work).should be_true
+
+      Timecop.travel(Date.today + 10) do
+        threads = (1..10).to_a.map {
+          Thread.new {
+            Thread.current[:locked] = SerialJob.can_lock_queue?(:serial_work)
+          }
+        }
+
+        # Only one worker should acquire lock
+        locks = threads.map {|t| t.join; t[:locked] }
+        locks.count(true).should == 1
+      end
+    end
   end
 
   describe ".perform" do

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ require 'rspec'
 require 'mock_redis'
 require 'resque'
 require 'resque-lonely_job'
+require 'timecop'
 
 RSpec.configure do |config|
   config.before(:suite) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-lonely_job
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-14 00:00:00.000000000 Z
+date: 2013-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &70264194773380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.20.0
   type: :runtime
   prerelease: false
-  version_requirements: *70264194773380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.20.0
 - !ruby/object:Gem::Dependency
   name: mock_redis
-  requirement: &70264194772640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: 0.4.1
   type: :development
   prerelease: false
-  version_requirements: *70264194772640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70264194772020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70264194772020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70264194771040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,31 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70264194771040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: debugger
-  requirement: &70264194768800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +101,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70264194768800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! "Ensures that for a given queue, only one worker is working on a job
   at any given time.\n\nExample:\n\n  require 'resque/plugins/lonely_job'\n\n  class
   StrictlySerialJob\n    extend Resque::Plugins::LonelyJob\n\n    @queue = :serial_work\n\n
@@ -99,15 +140,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 610459578686015102
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 610459578686015102
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A resque plugin that ensures that only one job for a given queue will be
@@ -115,4 +162,3 @@ summary: A resque plugin that ensures that only one job for a given queue will b
 test_files:
 - spec/lib/lonely_job_spec.rb
 - spec/spec_helper.rb
-has_rdoc: