lusnoc 0.1.2.16550 → 0.1.2.16562

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4af65d48d9995e47998f8bea63ce80596b489ef15c1a55ce2a507f89ed99d1e
-  data.tar.gz: 0d11b3ac2e867299c66d188fa9f10317d66b24df6bd17102e9c1d4c6ed0643f8
+  metadata.gz: e6702f81592770f748868d48751530d7cfb483b54b6a36c1d97df5cf1feeceb2
+  data.tar.gz: f2ba75f441735a84d4763db29a02fdcfedb30c019aa5da2d7ee09b9cd0a3592b
 SHA512:
-  metadata.gz: '03873f94e76a5859aba8579aca0c734119946a261ae46267b79b51f1bd171771253c6707e3b7f2b57b1ce2315d3e7a4c39f6a207c67e66a1257d7c56d6c0944a'
-  data.tar.gz: 1e2b77c07bcf4d44385fd6e2574aee7b633eafeaf34cdc0fe7c15309e6ddd248e84f469532dea4506698c7d6e9a03abf48cfa84846d69e18ee6ba5684f7deb6a
+  metadata.gz: 16dea1103ba3cc6489916bfdfb3c7aee0253bcb794a072f4acb407155f9ab50974ab67621bc6745b21ffecd86b13fb08f714ba75d58d6e7a2bf3fb5720014e79
+  data.tar.gz: d778a22d40088c0b257a289694a2e43f8b2aabcbce5c1ac72e8d1102057c30d1fe33f18b029a6f678c798e0d8d74499436305fc3466237e82782738cf78ac81c

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/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 = [t.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.16550
+  version: 0.1.2.16562
 platform: ruby
 authors:
 - Samoilenko Yuri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-23 00:00:00.000000000 Z
+date: 2019-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler