locksy 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43b6b34290b0dedbc0793205bb5cbb1d6e5442ebbcc241998529ed5e4d73d913
-  data.tar.gz: b59b6d7e9c999093e30a6119bf96c782d66db865f803ac2c0f2054b76e0e9a27
+  metadata.gz: 53e78ca0038c386a4c60193184ad752353ed2726ad7c7af82dfdeb7fda8fd301
+  data.tar.gz: ed70b0a19611a98ea40068e464dd5484acf4eefd7b06717ff73645730c44bf0d
 SHA512:
-  metadata.gz: 06f41badc92181f8d4d28e66fa59723488f78110aa3fbfcc7d974b89953db30684c529b5d08d6d0705900abdcc3f4959267f41bcb0a0e7acd1c6a3b77c547f41
-  data.tar.gz: ffe4a652c57acbe76680eb1204f647c0fcf8cf378f7839d4778fe3e6f16279cd3189f59f4ee18f275dd496a8363b4a43c715ec93f433e177a997bd912eeb7922
+  metadata.gz: f5fd3c5a18afdaa297d87d45601ff4ba1e24273b6c9f03d889180dfeb41935d9704654113b1ad729cb3cc85af3364221e236706ef18794cdaf7c6c575839f273
+  data.tar.gz: 664ff98be39c7b905df91cc0642b245dee757ccbecaccc43951cae3e6ac8e8eee19b35e11dcb0da927fc78159ca3e50fa981b60c0041907428071dffa1f4920f

data/lib/locksy.rb

@@ -1,2 +1,11 @@
-# Forward module declaration
-module Locksy; end
+require 'logger'
+
+module Locksy
+  def self.logger=(value)
+    @logger = value
+  end
+
+  def self.logger
+    @logger ||= ::Logger.new(STDOUT)
+  end
+end

data/lib/locksy/base_lock.rb

@@ -58,7 +58,7 @@ module Locksy
     end
 
     def logger
-      @logger ||= Logger.new
+      @logger || Locksy.logger
     end
 
     def expiry(after)

data/lib/locksy/dynamodb.rb

@@ -21,29 +21,37 @@ module Locksy
 
     def obtain_lock(expire_after: default_expiry, wait_for: nil, **_args)
       stop_waiting_at = wait_for ? now + wait_for : nil
-      expire_at = expiry(expire_after)
-      dynamo_client.put_item \
-        ({ table_name: table_name,
-           item: { id: lock_name, expires: expire_at, lock_owner: owner },
-           condition_expression: '(attribute_not_exists(expires) OR expires < :expires) ' \
-                                 'OR (attribute_not_exists(lock_owner) OR lock_owner = :owner)',
-           expression_attribute_values: { ':expires' => now, ':owner' => owner } })
-      expire_at
-    rescue Aws::DynamoDB::Errors::ConditionalCheckFailedException
-      if stop_waiting_at && stop_waiting_at > now
-        # Retry at a maximum of 1/2 of the remaining time until the
-        # current lock expires or the remaining time from the what the
-        # caller was willing to wait, subject to a minimum of 0.1s to
-        # prevent busy looping.
-        _wait_for_timeout \
-          ( if (current = retrieve_current_lock).nil?
-              0.1
-            else
-              [stop_waiting_at - now, [(current[:expires] - now) / 2, 0.1].max].min
-            end)
-        retry unless self.class.shutting_down?
+      begin
+        expire_at = expiry(expire_after)
+        logger.debug "trying to obtain lock #{lock_name} for #{owner} to be held until #{expire_at}"
+        dynamo_client.put_item \
+          ({ table_name: table_name,
+             item: { id: lock_name, expires: expire_at, lock_owner: owner },
+             condition_expression: '(attribute_not_exists(expires) OR expires < :now) ' \
+                                   'OR (attribute_not_exists(lock_owner) OR lock_owner = :owner)',
+             expression_attribute_values: { ':now' => now, ':owner' => owner } })
+        logger.debug "acquired lock #{lock_name} for #{owner} to be held until #{expire_at}"
+        expire_at
+      rescue Aws::DynamoDB::Errors::ConditionalCheckFailedException
+        if stop_waiting_at && stop_waiting_at > now
+          # Retry at a maximum of 1/2 of the remaining time until the
+          # current lock expires or the remaining time from the what the
+          # caller was willing to wait, subject to a minimum of 0.1s to
+          # prevent busy looping.
+          if (current = retrieve_current_lock).nil?
+            retry_wait = 0.1
+          else
+            retry_wait = [stop_waiting_at - now, [(current[:expires] - now) / 2, 0.1].max].min
+          end
+          logger.debug "Attempt to acquire lock #{lock_name} for #{owner} failed - "\
+            "lock owned by #{current[:owner]} until #{format('%0.02f', current[:expires])}. " \
+            "Will retry in #{format('%0.02f', retry_wait)}s"
+          _wait_for_timeout retry_wait
+          retry unless self.class.shutting_down?
+        end
+        logger.debug "Attempt to acquire lock #{lock_name} for #{owner} failed. Giving up"
+        raise build_not_owned_error_from_remote
       end
-      raise build_not_owned_error_from_remote
     end
 
     def release_lock

data/lib/locksy/factory.rb

@@ -0,0 +1,7 @@
+require_relative './lock_interface'
+require_relative './errors'
+
+module Locksy
+  class Factory
+  end
+end

data/lib/locksy/version.rb

@@ -1,5 +1,5 @@
 require_relative '../locksy'
 
 module Locksy
-  VERSION = '0.0.1'.freeze
+  VERSION = '0.0.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locksy
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - dan@52degreesnorth.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-20 00:00:00.000000000 Z
+date: 2020-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,16 +42,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -118,6 +118,7 @@ files:
 - lib/locksy/base_lock.rb
 - lib/locksy/dynamodb.rb
 - lib/locksy/errors.rb
+- lib/locksy/factory.rb
 - lib/locksy/lock_interface.rb
 - lib/locksy/memory.rb
 - lib/locksy/version.rb