robust-redis-lock 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5f81aecb46ec64804f60f5d67066896cbe05eb0
-  data.tar.gz: 7424bac609f9bf243345733935d3618ef2395ba5
+  metadata.gz: 7f2fa7e0d73f535b0954a4c2230d10c1210756c5
+  data.tar.gz: 6ade50d147b687dbd9c5d05c073e396200bd34d9
 SHA512:
-  metadata.gz: 11470af19b0e99a204d705ec229bfe2a8ea01279a1cb1af904a0f9f3c605483ffcf8c5fcb58572add121c8ab1d5f039a54397faefe4a9a0d656dd3033321a0aa
-  data.tar.gz: a050eb216fe5a95d117ba4d0f3bb69b8265b7b6fae11f7136c36aeaa27ad1b1daa0fb094d42cf2e8e41e1825916de208218d5d7ab9a1afb754b7c41650c6c5b9
+  metadata.gz: 3916b3b7333f21bd8aea9f56a019b61be216a5a4c54fd3a56ecfea874836a8d5049796a7fa895c0bfdc41ac166f5bd0efcd9012805bdefe09624f2959b6a893d
+  data.tar.gz: 21963e31733c5b397bbf4696ad9ab382e2fdf21c271e4c528b4c8ea442fde15a19f939bf269c0ce25027e0c08b12aa5d5270216d167a2b2581c7b99d7f48bf4b

data/lib/redis-lock.rb

@@ -77,7 +77,10 @@ class Redis::Lock
   end
 
   def data
-    @data ||= @serializer.load(@redis.hget(key, 'data'))
+    @data ||= begin
+                raw = @redis.hget(key, 'data')
+                @serializer.load(raw) if raw
+              end
   end
 
   def try_lock
@@ -100,8 +103,10 @@ class Redis::Lock
 
         redis.call('hset', key, 'expires_at', expires_at)
         redis.call('hset', key, 'token', next_token)
-        redis.call('hset', key, 'data', data)
         redis.call('zadd', key_group, expires_at, key)
+        if data then
+          redis.call('hset', key, 'data', data)
+        end
 
         if prev_expires_at then
           return {'recovered', next_token}
@@ -109,7 +114,7 @@ class Redis::Lock
           return {'acquired', next_token}
         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 = @@lock_script.eval(@redis, :keys => [@key, @key_group_key], :argv => [now.to_i, now.to_i + @expire, @serializer.dump(data)])
 
     @token = token if token
 

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: robust-redis-lock
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Kareem Kouddous