lusnoc 0.1.2.16548 → 0.9.0.44532

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bbe9d1f94b450c09aaeb7fe5283bef89ee796a4b57712af40603ba8eb5a3f0c
-  data.tar.gz: 2ceec91d3f94a92631698ad391b5c7848e57d4033dbd1766ab37d0cd75a1f322
+  metadata.gz: 05d4b47c5281bbcf7adc5cff1e398bd4ce37e2e8953b6a09e143404777c016dc
+  data.tar.gz: 6a7afa4d21df7cd7b19cd56290ef35d58befa6013fa2f713973da2059e74297d
 SHA512:
-  metadata.gz: 11b1834bca1940eea5d5099cff6100587bc5fbcf75ea012866629d23daa6f43a4c2cceeb76c26b58689adad5cffaad33f62d104fe3d75a33645cb4e39607b8e8
-  data.tar.gz: 5b356bfa4e314d7da5e4cba97e24abbe5b5ccfaa2e98c977d3c8f6d583c3f5ad3d12a616cf96f6ad120a3382d48dac2b53d197667fbcc9fbcee3886ad11362de
+  metadata.gz: 34da3a07c4705381614e65b9baf6b5d6f7200abb9912ad68baa1debb043fd9b4cbb32f3c3eed37cd50cee2b1a1b7243fb8794b0be8eb1f0cb7279ab0ce889a5f
+  data.tar.gz: b3ae1f8dae1f35c346378e3c53075807346c157cbe50c7f8cb200e47cb00f7c845db92f8a43a2e83c6423188a620a6dafc9978781d82cd4cc531127173b56553

data/README.md

@@ -2,15 +2,15 @@
 
 [![Gem Version](https://badge.fury.io/rb/lusnoc.svg)](https://rubygems.org/gems/lusnoc)
 [![Gem](https://img.shields.io/gem/dt/lusnoc.svg)](https://rubygems.org/gems/lusnoc/versions)
+[![YARD](https://badgen.net/badge/YARD/doc/blue)](http://www.rubydoc.info/gems/lusnoc)
 
-[![Test Coverage](https://api.codeclimate.com/v1/badges/ed48b89a9793a074cd23/test_coverage)](https://codeclimate.com/github/RnD-Soft/lusnoc/test_coverage)
-[![Maintainability](https://api.codeclimate.com/v1/badges/ed48b89a9793a074cd23/maintainability)](https://codeclimate.com/github/RnD-Soft/lusnoc/maintainability)
-[![Quality](https://lysander.x.rnds.pro/api/v1/badges/lusnoc_quality.svg)](https://lysander.x.rnds.pro/api/v1/badges/lusnoc_quality.html)
-[![Outdated](https://lysander.x.rnds.pro/api/v1/badges/lusnoc_outdated.svg)](https://lysander.x.rnds.pro/api/v1/badges/lusnoc_outdated.html)
-[![Vulnerabilities](https://lysander.x.rnds.pro/api/v1/badges/lusnoc_vulnerable.svg)](https://lysander.x.rnds.pro/api/v1/badges/lusnoc_vulnerable.html)
+[![Coverage](https://lysander.rnds.pro/api/v1/badges/lusnoc_coverage.svg)](https://lysander.rnds.pro/api/v1/badges/lusnoc_coverage.html)
+[![Quality](https://lysander.rnds.pro/api/v1/badges/lusnoc_quality.svg)](https://lysander.rnds.pro/api/v1/badges/lusnoc_quality.html)
+[![Outdated](https://lysander.rnds.pro/api/v1/badges/lusnoc_outdated.svg)](https://lysander.rnds.pro/api/v1/badges/lusnoc_outdated.html)
+[![Vulnerabilities](https://lysander.rnds.pro/api/v1/badges/lusnoc_vulnerable.svg)](https://lysander.rnds.pro/api/v1/badges/lusnoc_vulnerable.html)
 
 Lusnoc is reliable gem to deal with [Consul](https://www.consul.io). It is designed to be simple and work without dark background magic.
-It is inspired by [consul-mutex](https://github.com/discourse/consul-mutex)(which has hard background magic). 
+It is inspired by [consul-mutex](https://github.com/kinnalru/consul-mutex)(which has hard background magic). 
 
 ## FAQ
 
@@ -18,7 +18,7 @@ It is inspired by [consul-mutex](https://github.com/discourse/consul-mutex)(whic
 
 Lusnoc allows you to interact with Consul to provide distributed locks(mutex) to your application.
 
-#### What's the difference between lusnoc and [consul-mutex](https://github.com/discourse/consul-mutex) or [diplomat](https://github.com/WeAreFarmGeek/diplomat)
+#### What's the difference between lusnoc and [consul-mutex](https://github.com/kinnalru/consul-mutex) or [diplomat](https://github.com/WeAreFarmGeek/diplomat)
 * consul-mutex starts background thread and  ***the block of code that you pass to #synchronize runs on a separate thread, and can be killed without warning if the mutex determines that it no longer holds the lock.***
 * diplomat provides the basic session/locks functionality but no automated control over it
 
@@ -43,7 +43,7 @@ TTL will be used in session creation on `#synchronize`:
     puts "We are exclusively owns resource"
   end
 ```
-If mutex cannot be acquired within given timeout Lusnoc::TimeoutError is raised.
+If mutex cannot be acquired within given timeout `Lusnoc::TimeoutError` is raised.
 By default, the "value" of the lock resource will be the hostname of the
 machine that it's running on (so you know who has the lock).  If, for some
 reason, you'd like to set the value to something else, you can do that, too:

data/lib/lusnoc/guard.rb

@@ -6,33 +6,26 @@ module Lusnoc
 
     include Helper
 
+    attr_reader :callbacks
+
     def initialize(base_url)
       @base_url = base_url
+      @callbacks = {}
       yield(self) if block_given?
     end
 
     def condition(&block)
-      @condition = block
+      @callbacks[:condition] = block
       self
     end
 
     def then(&block)
-      @callback = block
+      @callbacks[:then] = block
       self
     end
 
     def run
-      th = Thread.new do
-        logger.info "Guard[#{@base_url.inspect}] thread started"
-        watch_forever(@base_url)
-        fire!
-      rescue StandardError => e
-        logger.error "Guard[#{@base_url.inspect}] error: #{e.inspect}"
-        fire!
-      ensure
-        logger.info "Guard[#{@base_url.inspect}] finihsed"
-      end
-
+      th = start_thread
       yield
     ensure
       th.kill rescue nil
@@ -40,28 +33,48 @@ module Lusnoc
 
     private
 
-      def fire!
-        @callback&.tap do |cb|
-          @callback = nil
+      def start_thread
+        Thread.new do
+          logger.info "Guard[#{@base_url.inspect}] thread started"
+          watch_forever(@base_url)
+          fire!
+        rescue StandardError => e
+          logger.error "Guard[#{@base_url.inspect}] error: #{e.inspect}"
+          logger.error e.backtrace
+          fire!(e)
+        ensure
+          logger.info "Guard[#{@base_url.inspect}] finihsed"
+        end
+      end
+
+      def fire!(*args)
+        @callbacks[:then]&.tap do |cb|
+          @callbacks[:then] = nil
           logger.info "Guard[#{@base_url.inspect}] fired"
-          cb.call
+          cb.call(*args)
         end
       end
 
       def watch_forever(base_url)
-        last_x_consul_index = 1
-
-        Kernel.loop do
-          resp = Lusnoc.http_get("#{base_url}?index=#{last_x_consul_index}&wait=10s", timeout: 15)
-          logger.debug "Guard[#{@base_url.inspect}] response: #{resp.body}"
-          return unless @condition.call(resp.body)
-
-          index = [Integer(resp['x-consul-index']), 1].max
-          last_x_consul_index = (index < last_x_consul_index ? 1 : index)
-          sleep 1
+        Lusnoc::Watcher.new(base_url).run(max_consul_wait: 10) do |body|
+          return true unless @callbacks[:condition].call(body)
         end
       end
 
+      # def watch_forever(base_url)
+      #   last_x_consul_index = 1
+
+      #   Kernel.loop do
+      #     resp = Lusnoc.http_get("#{base_url}?index=#{last_x_consul_index}&wait=10s", timeout: 15)
+      #     logger.debug "Guard[#{@base_url.inspect}] response: #{resp.body}"
+      #     return unless @callbacks[:condition].call(resp.body)
+
+      #     index = [Integer(resp['x-consul-index']), 1].max
+      #     last_x_consul_index = (index < last_x_consul_index ? 1 : index)
+      #     sleep 0.4
+      #   end
+      # end
+
   end
 end
 

data/lib/lusnoc/mutex.rb

@@ -46,7 +46,7 @@ module Lusnoc
         return acquisition_loop! key, session, value, t, &block
       ensure
         release(key, session.id, timeout: 2) rescue nil
-        logger.info("Lock #{key} released for session #{session.name}[#{session.id}]")
+        logger.info("Mutex[#{key}] released for Session[#{session.name}:#{session.id}]")
         @owner = nil
         @session = nil
       end
@@ -59,7 +59,7 @@ module Lusnoc
         return false if resp.body.chomp != 'true'
 
         @owner = Thread.current
-        logger.info("Lock #{key} acquired for session #{session.name}[#{session.id}]")
+        logger.info("Mutex[#{key}] acquired for Session[#{session.name}:#{session.id}]")
         renew
         true
       end
@@ -69,22 +69,44 @@ module Lusnoc
       end
 
       def acquisition_loop!(key, session, value, t)
-        return yield(self) if acquire(key, session, value)
+        if acquire(key, session, value)
+          prepare_guard(session, key).run do
+            return yield(self)
+          end
+        end
 
-        logger.debug("Start #{key} acquisition loop for session #{session.name}[#{session.id}]")
+        logger.debug("Mutex[#{key}] run acquisition loop for Session[#{session.name}:#{session.id}]")
         t.loop! do
           session.alive!(TimeoutError)
           wait_for_key_released(key, t.left)
 
-          return yield(self) if acquire(key, session, value)
+          if acquire(key, session, value)
+            prepare_guard(session, key).run do
+              return yield(self)
+            end
+          end
+
+          logger.debug("Mutex[#{key}] acquisition failed for Session[#{session.name}:#{session.id}]")
+          sleep 0.4
+        end
+      end
 
-          logger.debug("Lock #{key} acquisition failed for session #{session.name}[#{session.id}]")
-          sleep 1
+      def prepare_guard(session, key)
+        Lusnoc::Guard.new(build_url("/v1/kv/#{key}")) do |guard|
+          guard.condition do |body|
+            JSON.parse(body).first['Session'] == session.id rescue false
+          end
+
+          guard.then do
+            @owner = nil
+            logger.info("Mutex[#{key}] LOST for Session[#{session.name}:#{session.id}]")
+            @on_mutex_lost&.call(self)
+          end
         end
       end
 
       def wait_for_key_released(key, timeout = nil)
-        logger.debug "Waiting for key #{key} to be fre of any session"
+        logger.debug("Mutex[#{key}] start waiting of key releasing...")
         Lusnoc::Watcher.new(build_url("/v1/kv/#{key}"),
                             timeout:  timeout,
                             eclass:   TimeoutError,

data/lib/lusnoc/session.rb

@@ -8,10 +8,14 @@ module Lusnoc
 
     attr_reader :id, :name, :ttl, :alive, :expired_at
 
-    def initialize(name, ttl: 20)
+    def initialize(name, ttl: 20, &block)
       @name = name
       @ttl = ttl
 
+      run(&block) if block_given?
+    end
+
+    def run
       @id = create_session(name, ttl)
 
       prepare_guard(@id).run do
@@ -38,7 +42,7 @@ module Lusnoc
     end
 
     def alive!(exception_class = ExpiredError)
-      alive? || (raise exception_class.new("Session[#{@name}:#{@id}] expired"))
+      @alive || (raise exception_class.new("Session[#{@name}:#{@id}] expired"))
     end
 
     def renew
@@ -50,6 +54,8 @@ module Lusnoc
 
     def on_session_die(&block)
       @session_die_cb = block
+      @session_die_cb&.call(self) if @alive == false
+      self
     end
 
     private

data/lib/lusnoc/version.rb

@@ -1,6 +1,6 @@
 module Lusnoc
 
-  VERSION = '0.1.2'.freeze
+  VERSION = '0.9.0'.freeze
 
 end
 

data/lib/lusnoc/watcher.rb

@@ -12,19 +12,19 @@ module Lusnoc
                    eclass: Lusnoc::TimeoutError,
                    emessage: 'watch timeout')
       @base_url = base_url
-      @timeout = timeout
-      @eclass = eclass
+      @timeout  = timeout
+      @eclass   = eclass
       @emessage = emessage
     end
 
     # run Consul blocking request in a loop with timeout support.
     # break condition yielded by block call with response body
-    def run
+    def run(max_consul_wait: nil)
       logger.debug "Watch #{@base_url} with #{@timeout.inspect} timeout"
       last_x_consul_index = 1
 
       Timeouter.loop!(@timeout, eclass: @eclass, message: @emessage) do |t|
-        wait_condition = t.left ? "&wait=#{t.left.to_i}s" : ''
+        wait_condition = build_wait_condition(@base_url, t.left, max_consul_wait)
         url = "#{@base_url}?index=#{last_x_consul_index}#{wait_condition}"
 
         resp = Lusnoc.http_get(url, timeout: t.left)
@@ -34,7 +34,18 @@ module Lusnoc
 
         index = [Integer(resp['x-consul-index']), 1].max
         last_x_consul_index = (index < last_x_consul_index ? 1 : index)
-        sleep 1
+        sleep 0.4
+      end
+    end
+
+    def build_wait_condition(_url, time_left, max_consul_wait)
+      if time_left
+        max = [time_left.to_i, max_consul_wait.to_i].max
+        "&wait=#{max}s"
+      elsif max_consul_wait
+        "&wait=#{max_consul_wait.to_i}s"
+      else
+        ''
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lusnoc
 version: !ruby/object:Gem::Version
-  version: 0.1.2.16548
+  version: 0.9.0.44532
 platform: ruby
 authors:
 - Samoilenko Yuri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-23 00:00:00.000000000 Z
+date: 2021-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler