robust-redis-lock 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f2fa7e0d73f535b0954a4c2230d10c1210756c5
-  data.tar.gz: 6ade50d147b687dbd9c5d05c073e396200bd34d9
+  metadata.gz: a87fa0ff80f974931ac04891862c75421405bc71
+  data.tar.gz: e5eca4757e7d19d6cfd806a276669792ca1f225e
 SHA512:
-  metadata.gz: 3916b3b7333f21bd8aea9f56a019b61be216a5a4c54fd3a56ecfea874836a8d5049796a7fa895c0bfdc41ac166f5bd0efcd9012805bdefe09624f2959b6a893d
-  data.tar.gz: 21963e31733c5b397bbf4696ad9ab382e2fdf21c271e4c528b4c8ea442fde15a19f939bf269c0ce25027e0c08b12aa5d5270216d167a2b2581c7b99d7f48bf4b
+  metadata.gz: 5d52484eb62093f86949edede7e329ea6b7756e59f66c5b8189959d9f30354831f6fc9cc007aa929d447f1773d087da2b1a1ef108bc04e5f2aad324a217f38e0
+  data.tar.gz: e4f5c0cfebb70f1ac82ef638a89e80f3aed369bde4e912a06c19780e6d409660cac4acd2d193b8173ca8c5f8ca2184c79d504aaf9f963ce1f19a6e6acc4ed965

data/lib/redis-lock.rb

@@ -96,7 +96,7 @@ class Redis::Lock
 
         local prev_expires_at = tonumber(redis.call('hget', key, 'expires_at'))
         if prev_expires_at and prev_expires_at > now then
-          return {'locked', nil}
+          return {'locked', nil, nil}
         end
 
         local next_token = redis.call('incr', token_key)
@@ -104,23 +104,25 @@ class Redis::Lock
         redis.call('hset', key, 'expires_at', expires_at)
         redis.call('hset', key, 'token', next_token)
         redis.call('zadd', key_group, expires_at, key)
-        if data then
-          redis.call('hset', key, 'data', data)
-        end
+
+        local prev_data = redis.call('hget', key, 'data')
+        redis.call('hset', key, 'data', data)
 
         if prev_expires_at then
-          return {'recovered', next_token}
+          return {'recovered', next_token, prev_data}
         else
-          return {'acquired', next_token}
+          return {'acquired', next_token, nil}
         end
     LUA
-    result, token = @@lock_script.eval(@redis, :keys => [@key, @key_group_key], :argv => [now.to_i, now.to_i + @expire, @serializer.dump(data)])
+    result, token, prev_data = @@lock_script.eval(@redis, :keys => [@key, @key_group_key], :argv => [now.to_i, now.to_i + @expire, @serializer.dump(@data)])
 
     @token = token if token
 
     case result
     when 'locked'    then return false
-    when 'recovered' then return :recovered
+    when 'recovered'
+      prev_data = @serializer.load(prev_data) if prev_data
+      return prev_data || :recovered
     when 'acquired'  then return true
     end
   end

data/lib/robust-redis-lock/version.rb

@@ -1,5 +1,5 @@
 class Redis
   class Lock
-    VERSION = '0.4.2'
+    VERSION = '0.4.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: robust-redis-lock
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Kareem Kouddous
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-18 00:00:00.000000000 Z
+date: 2014-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis