uncomplicated_mutex 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9253fa85b32dc4ab8c5f27a02b005842fc64f9da
-  data.tar.gz: 7afc45c5489ed54b5994174a813fb909688687a6
+  metadata.gz: ef209e4d08baa69dfded75606346ec2da70471de
+  data.tar.gz: da46ce0c406935be7ca4a472d7d9a33739b8d59e
 SHA512:
-  metadata.gz: ab31143080b09789dcb5dc7f37b3be17c67be615e607310df5ea3788bdf5e69347021315b9dda2b9f9d9a6748ea42e374f5065ffb96f127ada2088ea10cbfde8
-  data.tar.gz: 7656e966695b403fec1261a0d5efe2c1e7de460e94864b2fc7e8700ce000f2f32635530585c2a6ca68b31ceddb29919429bfd5e7e4f236f0c0a42aa7e8aa52fe
+  metadata.gz: 5cc35a073f8b4a114328323ae4da7b0d944cd905bf39220b23ef2fe2ccc4c67a846f5ba9683daebdb9e359f8d52794cfd216f4e1aea4b2da7b5833a6eaf5766f
+  data.tar.gz: ca51e08793f7496088a3523f34019b486f40a7462ac726bade21e56b232001567671d5893e2803a4d5dd7924ecae335e5ff559e468767de41823f950051fdd0b

data/lib/uncomplicated_mutex.rb

@@ -12,12 +12,10 @@ class UncomplicatedMutex
   def initialize(obj, opts = {})
     @verbose          = opts[:verbose]
     @timeout          = opts[:timeout] || 300
-    @fail_on_timeout  = opts[:fail_on_timeout]
-    @ticks            = opts[:ticks] || 100
-    @wait_tick        = @timeout.to_f / @ticks.to_f
     @redis            = opts[:redis] || Redis.new
     @lock_name        = "lock:#{obj.class.name}:#{obj.id}".squeeze(":")
     @token            = Digest::MD5.new.hexdigest("#{@lock_name}_#{Time.now.to_f}")
+    set_expiration_time
   end
 
   def acquire_mutex
@@ -25,6 +23,10 @@ class UncomplicatedMutex
     @redis.eval(LUA_ACQUIRE, [ @lock_name ], [ @timeout, @token ]) == 1
   end
 
+  def current_token_value
+    @redis.get(@lock_name)
+  end
+
   def destroy_mutex
     puts("Destroying the lock #{@lock_name}") if @verbose
     @redis.del(@lock_name)
@@ -39,13 +41,9 @@ class UncomplicatedMutex
     end
   end
 
-  def overwrite_mutex
-    puts("Replacing the lock #{@lock_name} with #{@token}") if @verbose
-    @redis.set(@lock_name, @token)
-  end
-
   def recurse_until_ready(depth = 1)
-    return false if depth == @ticks
+    return false if time_has_expired
+    @initial_token = current_token_value if depth == 1
     wait_a_tick if depth > 1
     acquire_mutex || recurse_until_ready(depth + 1)
   end
@@ -55,9 +53,37 @@ class UncomplicatedMutex
     @redis.eval(LUA_RELEASE, [ @lock_name ], [ @token ])
   end
 
+  def same_token_as_before
+    new_token = current_token_value
+    if new_token == @initial_token
+      true
+    else
+      @initial_token = new_token
+      false
+    end
+  end
+
+  def set_expiration_time
+    @expiration_time = Time.now.to_i + @timeout
+  end
+
+  def time_has_expired
+    if Time.now.to_i > @expiration_time
+      if same_token_as_before
+        true
+      else
+        set_expiration_time
+        false
+      end
+    else
+      false
+    end
+  end
+
   def wait_a_tick
-    puts("Sleeping #{@wait_tick} for the lock #{@lock_name} to become available") if @verbose
-    sleep(@wait_tick)
+    sleep_time = rand(100).to_f / 100.0
+    puts("Sleeping #{sleep_time} for the lock #{@lock_name} to become available") if @verbose
+    sleep(sleep_time)
   end
 
   def wait_for_mutex
@@ -65,8 +91,7 @@ class UncomplicatedMutex
       puts("Acquired lock #{@lock_name}") if @verbose
     else
       puts("Failed to acquire the lock") if @verbose
-      raise MutexTimeout.new("Failed to acquire the lock") if @fail_on_timeout
-      overwrite_mutex
+      raise MutexTimeout.new("Failed to acquire the lock")
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uncomplicated_mutex
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Andrew Coleman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-22 00:00:00.000000000 Z
+date: 2015-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis