lock-smith 0.0.4 → 0.0.5

data/lib/locksmith/dynamodb.rb

@@ -15,45 +15,53 @@ module Locksmith
 
     def lock(name)
       lock = fetch_lock(name)
-      last_rev = lock[:Locked] || 0
+      last_rev = (lock["Locked"] || 0).to_i
       new_rev = Time.now.to_i
       attempts = 0
       while attempts < MAX_LOCK_ATTEMPTS
         begin
           Timeout::timeout(LOCK_TIMEOUT) do
-            release_lock(name, last_rev) if last_rev < (Time.now.to_i - TTL)
+            if last_rev != 0 && last_rev < (Time.now.to_i - TTL)
+              log(:at => "lock-expired", :lock => name, :last_rev => last_rev)
+              release_lock!(name)
+            end
             write_lock(name, 0, new_rev)
-            log(at: "lock-acquired", lock: name, rev: new_rev)
+            log(:at => "lock-acquired", :lock => name, :rev => new_rev)
             result = yield
             release_lock(name, new_rev)
-            log(at: "lock-released", lock: name, rev: new_rev)
+            log(:at => "lock-released", :lock => name, :rev => new_rev)
             return result
           end
         rescue AWS::DynamoDB::Errors::ConditionalCheckFailedException
+          log(:at => "lock-not-acquired", :lock => name, :last_rev => last_rev, :new_rev => new_rev)
           attempts += 1
         rescue Timeout::Error
           attempts += 1
           release_lock(name, new_rev)
-          log(at: "timeout-lock-released", lock: name, rev: new_rev)
+          log(:at => "timeout-lock-released", :lock => name, :rev => new_rev)
         end
       end
     end
 
     def write_lock(name, rev, new_rev)
-      locks.put({Name: name, Locked: new_rev},
+      locks.put({:Name => name, :Locked => new_rev},
         :if => {:Locked => rev})
     end
 
     def release_lock(name, rev)
-      locks.put({Name: name, Locked: 0},
+      locks.put({:Name => name, :Locked => 0},
         :if => {:Locked => rev})
     end
 
+    def release_lock!(name)
+      locks.put({:Name => name, :Locked => 0})
+    end
+
     def fetch_lock(name)
       if locks.at(name).exists?(consistent_read: true)
         locks[name].attributes.to_h(consistent_read: true)
       else
-        locks.put(Name: name, Locked: 0).attributes.to_h(consistent_read: true)
+        locks.put(:Name => name, :Locked => 0).attributes.to_h(consistent_read: true)
       end
     end
 
@@ -73,8 +81,8 @@ module Locksmith
 
     def dynamo
       @dynamo_lock.synchronize do
-        @db ||= AWS::DynamoDB.new(access_key_id: Config.aws_id,
-                                   secret_access_key: Config.aws_secret)
+        @db ||= AWS::DynamoDB.new(:access_key_id => Config.aws_id,
+                                  :secret_access_key => Config.aws_secret)
       end
     end
 

data/lib/locksmith/log.rb

@@ -4,11 +4,11 @@ module Locksmith
 
     def log(data)
       result = nil
-      data = {lib: "locksmith"}.merge(data)
+      data = {:lib => "locksmith"}.merge(data)
       if block_given?
         start = Time.now
         result = yield
-        data.merge(elapsed: Time.now - start)
+        data.merge(:elapsed => Time.now - start)
       end
       data.reduce(out=String.new) do |s, tup|
         s << [tup.first, tup.last].join("=") << " "

data/lib/locksmith/pg.rb

@@ -28,8 +28,12 @@ module Locksmith
       conn.exec("select pg_advisory_unlock($1)", [i])
     end
 
+    def conn=(conn)
+      @conn = conn
+    end
+
     def conn
-      @con ||= PG::Connection.open(
+      @conn ||= PG::Connection.open(
         dburl.host,
         dburl.port || 5432,
         nil, '', #opts, tty
@@ -44,7 +48,7 @@ module Locksmith
     end
 
     def log(data, &blk)
-      Log.log({ns: "postgresql-lock"}.merge(data), &blk)
+      Log.log({:ns => "postgresql-lock"}.merge(data), &blk)
     end
 
   end

data/readme.md

@@ -1,13 +1,11 @@
 # Locksmith
 
-**This software is beta quality. Check back later to hear battle testing results**
+**This software is beta quality. Check back later for production quality.**
 
 A library of locking algorithms for a variety of data stores. Supported Data Stores:
 
 * DynamoDB
 * PostgreSQL
-* TODO: Memcached
-* TODO: Redis
 * TODO: Doozerd
 * TODO: Zookeeper
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lock-smith
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors: