AdoccaMemcache 0.1.3 → 0.1.4

data/Rakefile

@@ -4,7 +4,7 @@ require 'rubygems'
 require 'hoe'
 require './lib/adocca_memcache.rb'
 
-Hoe.new('AdoccaMemcache', '0.1.3') do |p|
+Hoe.new('AdoccaMemcache', '0.1.4') do |p|
   p.rubyforge_name = 'adocca-plugins'
   p.author = 'adocca Entertainment AB'
   p.summary = 'A client library to simplify using memcached with Ruby on Rails projects.'

data/lib/am_memcache.rb

@@ -279,25 +279,50 @@ module Adocca
     # lock expiry time
     TRANS_EXPTIME = 10
     TRANS_MAX_TRIES = 10
-    
-    # memcache-driven transaction mechanism
-    def synchronize(key)
+
+    #
+    # Will create a reentrant lock on +key+, but waiting no more than +timeout+
+    # for the lock. Will sleep 1 second between each try.
+    #
+    # Will return whether the locking was successful.
+    #
+    def lock(key, options = {})
+      timeout = options[:timeout] || 1 << 32
+      expire = options[:expire] || 0
       cache_key = make_cache_key(key)
-      tries = 0
+      start_at = Time.now
       we_locked_now = false
       we_locked_earlier = false
       ok_value = "#{HOST_HASH}:#{Thread.current.object_id}"
-      while (!(we_locked_now = add(cache_key, ok_value, TRANS_EXPTIME)) && 
+      while (!(we_locked_now = add(cache_key, ok_value, expire)) && 
              !(we_locked_earlier = (get(cache_key) == ok_value)) &&
-             tries < TRANS_MAX_TRIES)
+             Time.now < start_at + timeout)
         sleep 1
-        tries += 1
       end
-      if we_locked_now || we_locked_earlier
-        yield
-        self.delete(cache_key) if we_locked_now
+      return we_locked_now || we_locked_earlier
+    end
+
+    #
+    # Will release any lock on +key+.
+    #
+    def unlock(key)
+      self.delete(make_cache_key(key))
+    end
+    
+    #
+    # memcache-driven locking mechanism
+    #
+    # Uses <i>lock</i> and <i>unlock</i>
+    #
+    def synchronize(key, &block)
+      if lock_success = lock(key, :expire => TRANS_EXPTIME, :timeout => TRANS_MAX_TRIES)
+        begin
+          yield
+        ensure
+          unlock(key)
+        end
       else
-        raise MemCacheError, "Couldn't obtain lock"
+        raise MemCacheError, "Couldn't obtain lock on #{key}"
       end
     end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: AdoccaMemcache
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
-date: 2006-12-22 00:00:00 +01:00
+  version: 0.1.4
+date: 2007-01-17 00:00:00 +01:00
 summary: A client library to simplify using memcached with Ruby on Rails projects.
 require_paths: 
 - lib