resque-lock-timeout 0.4.0 → 0.4.1

data/HISTORY.md

@@ -1,3 +1,7 @@
+## 0.4.1 (2012-11-19)
+
+* Bug fix, allow `@loner` job to be enqueued if timeout expires.
+
 ## 0.4.0 (2012-11-09)
 
 * Add `@loner` boolean option to prevent job being enqueued if already

data/lib/resque/plugins/lock_timeout.rb

@@ -110,11 +110,13 @@ module Resque
         @loner ||= false
       end
 
-      # Convenience method, not used internally.
+      # Convenience method to check if job is locked and lock did not expire.
       #
       # @return [Boolean] true if the job is locked by someone
       def locked?(*args)
-        lock_redis.exists(redis_lock_key(*args))
+        lock_until = lock_redis.get(redis_lock_key(*args))
+        return (lock_until.to_i > Time.now.to_i) if lock_timeout(*args) > 0
+        !lock_until.nil?
       end
 
       # @abstract
@@ -145,7 +147,7 @@ module Resque
       # @param [Array] args job arguments
       def before_enqueue_lock(*args)
         if loner
-          if locked?(*args) 
+          if locked?(*args)
             # Same job is currently running
             loner_enqueue_failed(*args)
             false

data/test/lock_test.rb

@@ -192,4 +192,14 @@ class LockTest < MiniTest::Unit::TestCase
     assert_equal 1, $success, 'One job should increment success'
   end
 
+  def test_loner_job_should_get_enqueued_if_timeout_expired
+    Resque.enqueue(LonelyTimeoutExpiringJob)
+    thread = Thread.new { @worker.process }
+
+    sleep 2.1 # Wait for job to finish.
+
+    Resque.enqueue(LonelyTimeoutExpiringJob)
+    assert_equal 1, Resque.size(:test), "Should be able to enqueue a loner job if one previously finished after the timeout"
+  end
+
 end

data/test/test_jobs.rb

@@ -146,3 +146,15 @@ class LonelyTimeoutJob
     $enqueue_failed += 1
   end
 end
+
+# This job won't complete before it's timeout
+class LonelyTimeoutExpiringJob
+  extend Resque::Plugins::LockTimeout
+  @queue = :test
+  @loner = true
+  @lock_timeout = 1
+
+  def self.perform
+    sleep 2
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-lock-timeout
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-09 00:00:00.000000000 Z
+date: 2012-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque