redis_locks 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e975e1077350b297e9a2e29dd2c1874ee36015cd
-  data.tar.gz: 43c25d4b9302e7530cbbfcaa12c9f75f81ad51b8
+  metadata.gz: 9c5d583e881ddb03eb3a27a20ec98600b66d756d
+  data.tar.gz: c2553b07d1bc3e33918ec0084410f4adeffc666d
 SHA512:
-  metadata.gz: 836660edb41f89794435460298714126fb583cfe95655c6d915061a2d42660412309804724fcf2c2749be0b59daa20bb446e6014d499ef8b85f058394b6c3363
-  data.tar.gz: f3ca402e401fbfc4a2cdac4167dc714ba327a7d58eb36d7b101fa875d2e77946d15c2876c757fb1523164e06a57c791e5df7e23b6d6da483e692d4b114569aff
+  metadata.gz: 04ba8f31d89668b2c872de19c14ee8896288db1f14de23301fa2b74bd9a27ea2305055b6f9105f4e3cabb304c3739c39dcf8a430a96d8a1661f96820636b9531
+  data.tar.gz: 240bdc28a11410e5a894687e28910d37d14f872fbfc2d762b56b9b80f8235134554d58151c52eb6186c97d0ac5afba5c3c36d31d84ec88c8881aa06b86f9e1fc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    redis_locks (0.0.1)
+    redis_locks (0.0.3)
       redis
 
 GEM

data/lib/redis_locks/mutex.rb

@@ -20,15 +20,22 @@ module RedisLocks
     def lock(expires_at: nil, &block)
       now = Time.now.utc.to_i
       locked = false
-      expires_at ||= now + @expires_in
+
+      if expires_at
+        expires_at = expires_at.to_i
+      else
+        expires_at = now + @expires_in
+      end
 
       if @redis.setnx(@key, expires_at)
         @redis.expire(@key, expires_at - now)
+        @expires_at = expires_at
         locked = true
       else # it was locked
         if (old_value = @redis.get(@key)).to_i <= now
           # lock has expired
           if @redis.getset(@key, expires_at) == old_value
+            @expires_at = expires_at
             locked = true
           end
         end
@@ -46,16 +53,15 @@ module RedisLocks
     end
 
     def unlock
-      @redis.watch(@key) do
-        # only delete the key if it's still valid, and will be for another 2 seconds
-        if @redis.get(@key).to_i > Time.now.utc.to_i + 2
-          @redis.multi do |multi|
-            multi.del(@key)
-          end
-        else
-          @redis.unwatch
-        end
+      return unless @expires_at
+
+      # To prevent deleting a lock acquired from another process, only delete
+      # the key if it's still valid, and will be for another 2 seconds
+      if Time.now.utc.to_i - 2 < @expires_at
+        @redis.del(@key)
       end
+
+      @expires_at = nil
     end
 
     private

data/lib/redis_locks/version.rb

@@ -1,3 +1,3 @@
 module RedisLocks
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis_locks
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Academia.edu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-15 00:00:00.000000000 Z
+date: 2016-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis