redis-read-write-locks 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c9401651786ff69991b9b975ebbc62cf0442fd3f2639c79fad803fab00f335e
-  data.tar.gz: 724513d599b3a614e43a3be6b634ad52c1d64035c63ddfb1566e2c93d4a837a6
+  metadata.gz: cf0e4824a200a3a7edd4b4dfe626ebfb8cb243b69ed87ebeba49f8e545067708
+  data.tar.gz: 24165395045c8fb6ab49d243beeb711d693efbbb79d709b4bb680e6a94947566
 SHA512:
-  metadata.gz: be039491564babb54c6e1b5ce87e880bc643f4f761efa24faadbc9c2a890e019c48daac13ebbd83409b0db60885b21e23b53fa7fc2d83a879662690fafab2b2a
-  data.tar.gz: 765be840a9d1abba171df6cee27dc3c775eac4ad8edfdf38eebbc32c21a09e51912713ae7006d6863fc9ff8d6e6299dd1820be503231443169ebb36db62530b0
+  metadata.gz: 93156958fcdb655a7539aa1dc00f5d2ba8a287d374f3eedd65352bff7af1ac27a031058d1bba1db04afa8c99af72bde2ca9c2763797ddb48f2d0fd5bf839bea8
+  data.tar.gz: be70fc26075e27252d6070c1770ad1aa0ca8cdfece6b85aa6ac226db41d522878a4d0aebb847535da029666f2f778ddb6f51ac69a43cffcc2d8891b32eaea4c2

data/lib/redis_read_write_locks/base_lock.rb

@@ -3,7 +3,7 @@ require "securerandom"
 module RedisReadWriteLocks
   class BaseLock
     DEFAULT_TTL = 30_000
-    RETRY_INTERVAL = 0.01
+    DEFAULT_RETRY_DELAY = 100
 
     attr_reader :name, :token
 
@@ -19,23 +19,20 @@ module RedisReadWriteLocks
       @acquired
     end
 
-    # Non-blocking: returns true/false.
-    # With timeout: retries for timeout milliseconds, returns true or raises LockTimeoutError.
-    def acquire(timeout: nil)
-      return try_acquire if timeout.nil?
+    def acquire(retry_count: nil, retry_delay: DEFAULT_RETRY_DELAY)
+      return try_acquire if retry_count.nil?
 
-      deadline = Time.now.to_f + timeout / 1000.0
-      loop do
+      return true if try_acquire
+      retry_count.times do
+        sleep retry_delay / 1000.0
         return true if try_acquire
-        raise LockTimeoutError, "Timeout acquiring #{lock_type} lock '#{@name}'" if Time.now.to_f >= deadline
-        sleep RETRY_INTERVAL
       end
+      raise LockTimeoutError, "Could not acquire #{lock_type} lock '#{@name}' after #{retry_count} retries"
     end
 
-    # Acquires lock, yields, releases. Raises LockNotAcquiredError if non-blocking acquire fails.
-    def synchronize(timeout: nil, &block)
-      if timeout
-        acquire(timeout: timeout)
+    def synchronize(retry_count: nil, retry_delay: DEFAULT_RETRY_DELAY, &block)
+      if retry_count
+        acquire(retry_count: retry_count, retry_delay: retry_delay)
       else
         acquire || raise(LockNotAcquiredError, "Could not acquire #{lock_type} lock '#{@name}'")
       end

data/lib/redis_read_write_locks/client.rb

@@ -5,14 +5,14 @@ module RedisReadWriteLocks
       @default_ttl = default_ttl
     end
 
-    def read_lock(name, ttl: @default_ttl, timeout: nil, &block)
+    def read_lock(name, ttl: @default_ttl, retry_count: nil, retry_delay: BaseLock::DEFAULT_RETRY_DELAY, &block)
       lock = ReadLock.new(redis: @redis, name: name, ttl: ttl)
-      block ? lock.synchronize(timeout: timeout, &block) : lock
+      block ? lock.synchronize(retry_count: retry_count, retry_delay: retry_delay, &block) : lock
     end
 
-    def write_lock(name, ttl: @default_ttl, timeout: nil, &block)
+    def write_lock(name, ttl: @default_ttl, retry_count: nil, retry_delay: BaseLock::DEFAULT_RETRY_DELAY, &block)
       lock = WriteLock.new(redis: @redis, name: name, ttl: ttl)
-      block ? lock.synchronize(timeout: timeout, &block) : lock
+      block ? lock.synchronize(retry_count: retry_count, retry_delay: retry_delay, &block) : lock
     end
   end
 end

data/lib/redis_read_write_locks/version.rb

@@ -1,3 +1,3 @@
 module RedisReadWriteLocks
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-read-write-locks
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Umbrellio