resque-workers-lock 1.2 → 1.3

data/lib/resque/plugins/workers/lock.rb

@@ -14,12 +14,20 @@ module Resque
         
         # Override in your job to control the queue lock key
         def lock_enqueue(*args)
-          "enqueuelock:#{name}-#{args.to_s}"
+          "#{name}-#{args.to_s}"
+        end
+        
+        def get_lock_enqueue(*args)
+          "enqueuelock:"+lock_enqueue(*args).to_s
         end
         
         # Override in your job to control the workers lock key.
         def lock_workers(*args)
-          "workerslock:#{name}-#{args.to_s}"
+          "#{name}-#{args.to_s}"
+        end
+        
+        def get_lock_workers(*args)
+          "workerslock:"+lock_workers(*args).to_s
         end
         
         # Override in your job to change the perform requeue delay
@@ -34,7 +42,7 @@ module Resque
           if lock_enqueue(*args) == false
             return true
           else
-            return Resque.redis.setnx(lock_enqueue(*args).to_s, true)
+            return Resque.redis.setnx(get_lock_enqueue(*args), true)
           end
         end
         
@@ -42,10 +50,10 @@ module Resque
         # If it raises Resque::Job::DontPerform, the job is aborted.
         def before_perform_lock(*args)
           if lock_workers(*args)
-            nx = Resque.redis.setnx(lock_workers(*args).to_s, true)
+            nx = Resque.redis.setnx(get_lock_workers(*args), true)
             if nx == false
               sleep(requeue_perform_delay)
-              Resque.redis.del(lock_enqueue(*args).to_s)
+              Resque.redis.del(get_lock_enqueue(*args))
               Resque.enqueue(self, *args)
               raise Resque::Job::DontPerform
             end
@@ -54,7 +62,7 @@ module Resque
         
         def after_dequeue_lock(*args)
           # Clear the lock when dequeueed
-          Resque.redis.del(lock_enqueue(*args).to_s)
+          Resque.redis.del(get_lock_enqueue(*args))
         end
       
         def around_perform_lock(*args)
@@ -62,15 +70,15 @@ module Resque
             yield
           ensure
             # Clear the lock. (even with errors)
-            Resque.redis.del(lock_workers(*args).to_s)
-            Resque.redis.del(lock_enqueue(*args).to_s)
+            Resque.redis.del(get_lock_workers(*args))
+            Resque.redis.del(get_lock_enqueue(*args))
           end
         end
         
         def on_failure_lock(exception, *args)
           # Clear the lock on DirtyExit
-          Resque.redis.del(lock_workers(*args).to_s)
-          Resque.redis.del(lock_enqueue(*args).to_s)
+          Resque.redis.del(get_lock_workers(*args))
+          Resque.redis.del(get_lock_enqueue(*args))
         end
         
       end

data/test/lock_test.rb

@@ -18,12 +18,12 @@ class LockTest < Test::Unit::TestCase
     extend Resque::Plugins::Workers::Lock
     @queue = :lock_test
     
-    #def self.lock_enqueue(id)
-    #  return id.to_s
-    #end
+    def self.lock_enqueue(id)
+      return id.to_s+"e"
+    end
     
     def self.lock_workers(id)
-      return id.to_s
+      return id.to_s+"w"
     end
     
     def self.perform(id)
@@ -53,14 +53,14 @@ class LockTest < Test::Unit::TestCase
   def test_enqueue
     3.times { Resque.enqueue(SimilarJob) }
 
-    assert_equal "workerslock:LockTest::SimilarJob-[]", SimilarJob.lock_workers
-    assert_equal "enqueuelock:LockTest::SimilarJob-[]", SimilarJob.lock_enqueue
+    assert_equal "LockTest::SimilarJob-[]", SimilarJob.lock_workers
+    assert_equal "LockTest::SimilarJob-[]", SimilarJob.lock_enqueue
     assert_equal 1, Resque.redis.llen('queue:lock_test')
     
     3.times do |i|
-      Resque.enqueue(UniqueJob, (i+100).to_s)
-      #assert_equal i.to_s, UniqueJob.lock_enqueue(i.to_s)
-      assert_equal i.to_s, UniqueJob.lock_workers(i.to_s)
+      Resque.enqueue(UniqueJob, i+100)
+      assert_equal i.to_s+"e", UniqueJob.lock_enqueue(i)
+      assert_equal i.to_s+"w", UniqueJob.lock_workers(i)
     end
     
     assert_equal 4, Resque.redis.llen('queue:lock_test')
@@ -73,13 +73,11 @@ class LockTest < Test::Unit::TestCase
   end
   
   def test_zcleanup
-    Resque.redis.del(SimilarJob.lock_workers)
-    Resque.redis.del(SimilarJob.lock_enqueue)
+    Resque.remove_queue(:lock_test)
+    
+    Resque.redis.keys('enqueuelock:*').collect { |x| Resque.redis.del(x) }.count
+    Resque.redis.keys('workerslock:*').collect { |x| Resque.redis.del(x) }.count
     
-    3.times do |i|
-      Resque.redis.del(UniqueJob.lock_enqueue((i+100).to_s))
-    end
-    Resque.redis.del('queue:lock_test')
     assert_equal 0, Resque.redis.llen('queue:lock_test')
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-workers-lock
 version: !ruby/object:Gem::Version
-  version: '1.2'
+  version: '1.3'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-27 00:00:00.000000000 Z
+date: 2012-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque