resque-uniq 0.0.8 → 0.0.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjRmZjI0Zjc1ZDZhYTlmMzdkZmEwMzliZDI0ZDVmMjdiZmQ3MGU0Nw==
+    ZDc0ZDlmZTMyMzE4MWM5ODI5ZDFlNDEwNmQ4ZWRlYTFlYmYyM2JmMQ==
   data.tar.gz: !binary |-
-    NGI1MzBmYTAxZmQyMmUzYzA3OWMxYmRhOWY3NjkyY2Y4MjYwNDgzYw==
+    OGEyYmYyZTA5Mjk4OWMzYjM3MmRlZDk3MDJmMjZkOWEwYjg1ZWY1ZQ==
 SHA512:
   metadata.gz: !binary |-
-    ZGZlODU2YWZkZGM2MDRkMjEyOWU4MTdlZDg5YjA4M2MzZDM0YzU5M2UwMjdh
-    YmY1NTBkYjE3ZmJmYzA4M2ZkNzM2OWYzNTcwMzRhZmM3YzRhYWVmMGJlMDEy
-    YjljNzFjZTg2MzNhMWRhMjgyZGY1MzcyYmJhZDEyY2RjZWQ2MDA=
+    Y2QxNWQ2OTYwZTQzNTk3ODlmY2VkMjEwMWE5YWEzZGU0Y2NhZTI2YTMyODYw
+    YmJiNTk5M2Y1YjhjM2FkNzE3ZmUxYzQ1MGQ2MjE4MmUzYzkyOTI0NGUwZDk1
+    MDBmYzE4NjFlNzI0YjVhNWJiYzc1MmQ5ZDVkODc3YjE2MWY1NzM=
   data.tar.gz: !binary |-
-    Y2VlY2MxYTczNjFjMGUwMGM2NTZiYjYyY2QzMjdiYTM4YTVhMzA1N2ZlY2Jm
-    NDdkYjBiYjA5ZDgyMmJhYzMxYWU3NjA1NWE4YTM5MjJkZDc5NTczNjM0M2Rm
-    ZTZmYWQ5MDJhMDFmYTRhNjI2N2M0Y2UxMTZlM2I2YTJiMDRkMDc=
+    MTIxMmNjYzc5MmJhYWM5NzZkMzRmMTJmZDkzMDQzYWFhNTQ5M2VlMjAzNzE0
+    YTRhMDA0OTM1MjNmMzZiYmQyMTZhYTg5ZjhjNmRjMTBjOTg3Y2MyMmI3Njg4
+    MjNiNWI2YTE3YjgyOGRjZWM3NTI1ZjU4NmNkMWMzMTNjOTAwZDg=

data/Gemfile

@@ -1,4 +1,4 @@
-source  'https://rubygems.org'
+source 'https://rubygems.org'
 
 gemspec
 

data/lib/resque-uniq/version.rb

@@ -1,3 +1,3 @@
 module ResqueUniq
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/lib/resque/plugins/unique_job.rb

@@ -21,10 +21,10 @@ module Resque
       end
 
       def stale_lock?(lock)
-        return false unless Resque.redis.get(lock)
+        return false unless get_lock(lock)
 
         rlock = run_lock_from_lock(lock)
-        return false unless Resque.redis.get(rlock)
+        return false unless get_lock(rlock)
 
         Resque.working.map {|w| w.job }.map do |item|
           begin
@@ -39,15 +39,29 @@ module Resque
         true
       end
 
+      def ttl
+        instance_variable_get(:@unique_lock_autoexpire) || respond_to?(:unique_lock_autoexpire) && unique_lock_autoexpire
+      end
+
+      def get_lock(lock)
+        lock_value = Resque.redis.get(lock)
+        set_time = lock_value.to_i
+        if ttl && set_time && (set_time > Time.now.to_i - ttl)
+          Resque.redis.del(lock)
+          nil
+        else
+          lock_value
+        end
+      end
+
       def before_enqueue_lock(*args)
         lock_name = lock(*args)
         if stale_lock? lock_name
           Resque.redis.del lock_name
-          Resque.redis.del "#{RUN_LOCK_NAME_PREFIX}#{lock_name}"
+          Resque.redis.del run_lock_from_lock(lock_name)
         end
         not_exist = Resque.redis.setnx(lock_name, Time.now.to_i)
         if not_exist
-          ttl = instance_variable_get(:@unique_lock_autoexpire) || respond_to?(:unique_lock_autoexpire) && unique_lock_autoexpire
           if ttl && ttl > 0
             Resque.redis.expire(lock_name, ttl)
           end

data/test/unique_job_test.rb

@@ -27,6 +27,7 @@ class UniqueJobTest < Test::Unit::TestCase
 
   def setup
     Resque.remove_queue(Resque.queue_from_class(Job))
+    Resque.remove_queue(Resque.queue_from_class(AutoexpireLockJob))
     Resque.redis.keys('*:UniqueJobTest::*').each {|k| Resque.redis.del(k) }
   end
 
@@ -93,4 +94,9 @@ class UniqueJobTest < Test::Unit::TestCase
     assert_equal 2, Resque.size(Resque.queue_from_class(ExtendedAutoExpireLockJob))
   end
 
+  def test_cleans_up_old_lock_during_enqueue
+    Resque.redis.set(AutoexpireLockJob.lock(123), Time.now.to_i + 100)
+    Resque.enqueue(AutoexpireLockJob, 123)
+    assert_equal 1, Resque.size(Resque.queue_from_class(AutoexpireLockJob))
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resque-uniq
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Trung Duc Tran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-24 00:00:00.000000000 Z
+date: 2014-01-28 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: