redis_getlock 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 010459a0c19e3b361f1f0a72d654c017e24f61a1
-  data.tar.gz: 9b08bf52a858125339c95893d0d76ca2eed1e8a8
+  metadata.gz: 9c0826498386afb3440ad4c10e7ce2b984a6eac2
+  data.tar.gz: f52a7bc3a8d04316bb3985025ca859b4f703885b
 SHA512:
-  metadata.gz: 08686f08d50978d37900b3cc402583587585b16bf5a45b45611bb8497c0d1b750c4886130bd88aed053e2f203dbc56731d7f3eea2b37036c8a3eed7a68526e42
-  data.tar.gz: efb8e7b53b4c1afbc16c2e9869ded9ee78338ebfec2108e05c9060a63ab49b9dbe8a2a7437161bc723a9a0dc8518a34f2203427df27055b02f58690f686331ca
+  metadata.gz: d5a15c9c815fb0c2a7b8fe586bbe5985b17aab40b8f0193a9098e5345e396ec1b440e7776c3e6eec9230296304130b748b5f2f8a4560c44a42f4b8f5c037faec
+  data.tar.gz: 950bcb6a8643fdb4470c9963389d11bbe2c9d275bb53567f997ad25787619396474025ca4c9a4a95a20dae51db718b35833d636162c5056ada289ac110d02f1e

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# 0.3.0 (2016-08-28)
+
+Enhancements:
+
+* Add #self_locked? method
+
+Changes:
+
+* Change payload value format to add #self_locked? method
+
 # 0.2.0 (2016-08-28)
 
 Changes:

data/README.md

@@ -77,11 +77,13 @@ Similarly with ruby standard library [mutex](https://ruby-doc.org/core-2.2.0/Mut
 * lock
   * Attempts to grab the lock and waits if it isn’t available.
 * locked?
-  * Returns true if this lock is currently held by some.
+  * Returns true if this lock is currently held by some (including myself).
 * synchronize {}
   * Obtains a lock, runs the block, and releases the lock when the block completes.
 * unlock
   * Releases the lock.
+* self_locked?
+  * Returns true if this lock is currently held by myself.
 
 Options of `RedisGetlock.new` are:
 

data/bin/try

@@ -14,7 +14,7 @@ mutex = RedisGetlock.new(redis: Redis.new, key: 'redis_getlock', logger: Logger.
 puts 'redis-cli> del redis_getlock'
 mutex.synchronize do
   loop do
-    puts mutex.locked?
+    puts "locked?:#{mutex.locked?} self_locked?:#{mutex.self_locked?}"
     sleep 1
   end
 end

data/lib/redis_getlock/version.rb

@@ -1,3 +1,3 @@
 class RedisGetlock
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/redis_getlock.rb

@@ -1,9 +1,10 @@
 require 'redis'
 require "redis_getlock/version"
 require 'securerandom'
+require 'json'
 
 class RedisGetlock
-  attr_reader :redis, :key, :logger, :expire, :interval
+  attr_reader :redis, :key, :logger, :expire, :interval, :uuid
 
   EXPIRE = 2
   INTERVAL = 1
@@ -14,17 +15,17 @@ class RedisGetlock
     @logger = logger
     @expire = expire
     @interval = interval
+    @uuid = SecureRandom.uuid
   end
 
   def lock
     logger.info { "#{log_head}Wait acquiring a redis lock '#{key}'" } if logger
     if set_options_available?
       lock_with_set_options
-      @thr = Thread.new(&method(:keeplock_with_set_options))
     else
       lock_without_set_options
-      @thr = Thread.new(&method(:keeplock_without_set_options))
     end
+    @thr = Thread.new(&method(:keeplock))
     logger.info { "#{log_head}Acquired a redis lock '#{key}'" } if logger
   end
 
@@ -38,6 +39,10 @@ class RedisGetlock
     redis.exists(key)
   end
 
+  def self_locked?
+    redis.exists(key) && uuid == JSON.parse(redis.get(key))['uuid']
+  end
+
   def synchronize(&block)
     lock
     begin
@@ -62,16 +67,10 @@ class RedisGetlock
   # redis >= 2.6.12
   # ref. http://redis.io/commands/set
   def lock_with_set_options
-    uuid = SecureRandom.uuid
-    loop do
-      break if redis.set(key, uuid, {nx: true, ex: expire}) # key does not exist
-      sleep interval
-    end
-  end
-
-  def keeplock_with_set_options
     loop do
-      redis.expire(key, expire) # extend expiration
+      current = Time.now.to_f
+      payload = {uuid: uuid, expire_at: (current + expire).to_s}.to_json
+      break if redis.set(key, payload, {nx: true, ex: expire}) # key does not exist
       sleep interval
     end
   end
@@ -81,23 +80,25 @@ class RedisGetlock
   def lock_without_set_options
     loop do
       current = Time.now.to_f
-      if redis.setnx(key, (current + expire).to_s) # key does not exist
+      payload = {uuid: uuid, expire_at: (current + expire).to_s}.to_json
+      if redis.setnx(key, payload) # key does not exist
         redis.expire(key, expire)
         break # acquire lock
       end
-      expired = redis.get(key)
-      if expired.to_f < current # key exists, but expired
-        compared = redis.getset(key, (current + expire).to_s)
-        break if expired == compared # acquire lock
+      previous = JSON.parse(redis.get(key))
+      if previous['expire_at'].to_f < current # key exists, but previous
+        compared = redis.getset(key, paylod)
+        break if previous['expire_at'] == compared['expire_at'] # acquire lock
       end
       sleep interval
     end
   end
 
-  def keeplock_without_set_options
+  def keeplock
     loop do
       current = Time.now.to_f
-      redis.setex(key, expire,  (current + expire).to_s) # extend expiration
+      payload = {uuid: uuid, expire_at: (current + expire).to_s}.to_json
+      redis.setex(key, expire, payload) # extend expiration
       sleep interval
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis_getlock
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Naotoshi Seo