ruby_rabbitmq_janus 2.2.2 → 2.3.0.pre.170

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 358887b9e59758b7950a69d1ae571a266c5f5bf3f4eef0191a12594e34570362
-  data.tar.gz: ba781a23afa2913cbe4324f6410459beae49c66ceb615375349ed83d17282d49
+  metadata.gz: 2199de64c8b40d5f83cc1359124c2a723eb77c527396bd5a64a4272938a96f4c
+  data.tar.gz: b6d0de19bbcef76110c3ad405174bae6120c43d50eb7865baa65f5956511f498
 SHA512:
-  metadata.gz: 35187cc5f01a6251aee1dbfe9996a4dae24c825def8f9844ef134f72eea5a81c80cd4e2c27a3d172dea19d1748936155281da00af64e706fdbc4d66c642c08c6
-  data.tar.gz: ddaa4e423cf02e148629fdaad043171e472e4c304e12a0ef0c639208ab10a552fa79f78a40d88ed7fb97fa22059b6b3f33160ac4c7ebccd912bdf7a2d29dbbf9
+  metadata.gz: a652690ada2cda692dbb908d14983f490e423eee4c085aa5ccf65cc86e048392b99fcb8871428dbae7d80e3e3b4caaf17c0c89a3b4d00f4b216629b3f9f9eb37
+  data.tar.gz: ef190a5aed5e25dcc3e43516f5d499945e7f6ae9fc99e063a60af189ac69967fbf145bed5f29dad9083905279ced3236c6be3c8d63357b4426e5afb1fdaf64a4

data/lib/rrj/info.rb

@@ -6,7 +6,7 @@
 # Define constant to gem.
 module RubyRabbitmqJanus
   # Define version to gem
-  VERSION = '2.2.2'
+  VERSION = '2.3.0'
 
   # Name to gem
   GEM_NAME = 'ruby_rabbitmq_janus'

data/lib/rrj/janus/processus/keepalive/keepalive_message.rb

@@ -13,7 +13,7 @@ module RubyRabbitmqJanus
         attr_reader :instance
 
         def initialize(instance)
-          @instance = instance
+          @instance = instance.id
         end
 
         def session

data/lib/rrj/janus/processus/keepalive/keepalive_thread.rb

@@ -17,6 +17,8 @@ module RubyRabbitmqJanus
           @rabbit = rabbit
           @timer = KeepaliveTimer.new
           @message = KeepaliveMessage.new(instance)
+          instance.set(thread: __id__)
+          Tools::Log.instance.info "Keepalive thread id is #{__id__}"
           super(&block)
         rescue
           raise Errors::Janus::KeepaliveThread::Initializer
@@ -35,8 +37,12 @@ module RubyRabbitmqJanus
         def restart_session
           Tools::Log.instance.warn 'Restart session ...'
           janus = find_model
-          send_messages_restart
-          janus.set(session: @session)
+          if janus.present?
+            send_messages_restart
+            janus.set(session: @session)
+          else
+            Tools::Log.instance.error 'Janus Instance Model is gone, giving up'
+          end
         rescue
           raise Errors::Janus::KeepaliveThread::RestartSession
         end
@@ -44,9 +50,18 @@ module RubyRabbitmqJanus
         # Start a timer for TTL
         def start
           @timer.loop_keepalive do
-            Tools::Log.instance.info 'Send keepalive to instance ' \
-              "#{@message.instance} with TTL #{@timer.time_to_live}"
-            response_keepalive
+            if detached?(find_model)
+              Tools::Log.instance.info \
+                "Thread #{__id__} no longer attached to Janus Instance, exiting..."
+              @timer.stop_timer
+              cleanup
+              exit
+            else
+              Tools::Log.instance.info "Thread #{__id__} " \
+                'sending keepalive to instance ' \
+                "#{@message.instance} with TTL #{@timer.time_to_live}"
+              response_keepalive
+            end
           end
         rescue
           raise Errors::Janus::KeepaliveThread::Start
@@ -54,10 +69,7 @@ module RubyRabbitmqJanus
 
         # Kill session and disable instance
         def kill
-          if @session.present? && @message.present?
-            response_destroy if find_model.enable
-          end
-          @rabbit.close
+          cleanup
           super
         rescue
           raise Errors::Janus::KeepaliveThread::Kill
@@ -65,10 +77,15 @@ module RubyRabbitmqJanus
 
         def instance_is_down
           janus = find_model
-          janus.set(enable: false).unset(%I[thread session])
-          Tools::Log.instance.fatal \
-            "Janus Instance [#{janus.instance}] is down, kill thread."
-          prepare_kill_thread
+          @session = @message = nil
+          if detached?(janus)
+            Tools::Log.instance.error\
+            "Thread [#{__id__}] no longer attached to Janus Instance (should be dead)."
+          else
+            janus.set(enable: false).unset(%I[thread session])
+            Tools::Log.instance.fatal \
+            "Janus Instance [#{janus.instance}] is down, thread [#{__id__}] will die."
+          end
         rescue
           raise Errors::Janus::KeepaliveThread::InstanceIsDown
         end
@@ -82,17 +99,26 @@ module RubyRabbitmqJanus
           response_keepalive
         end
 
-        def prepare_kill_thread
-          @session = @message = nil
-          KeepaliveThread.instance_method(:kill).bind(self).call
+        def cleanup
+          if @session.present? && @message.present?
+            response_destroy
+          end
+          @rabbit.close
         end
 
         def find_model
-          if @session.blank?
+          if (@message.present?)
             Models::JanusInstance.find(@message.instance)
           else
+            Tools::Log.instance.warn 'Lookup Janus Instance model by session [#{@session}]'
             Models::JanusInstance.find_by_session(@session)
           end
+        rescue
+          nil
+        end
+
+        def detached?(janus)
+          janus.blank? or janus.thread != __id__
         end
 
         def publisher

data/lib/rrj/janus/processus/keepalive/keepalive_timer.rb

@@ -25,7 +25,7 @@ module RubyRabbitmqJanus
         def initialize
           @time_to_live = Tools::Config.instance.ttl
           @time_to_die = test_time_to_die >= 60 ? 59 : test_time_to_die
-          @timer = Timers::Group.new
+          @timers = Timers::Group.new
         rescue
           raise Errors::Janus::KeepaliveTimer::Initializer
         end
@@ -33,8 +33,8 @@ module RubyRabbitmqJanus
         # Execute a loop with timer for sending keepalive message
         # to Janus Instance
         def loop_keepalive(&block)
-          @timer.now_and_every(@time_to_live) { prepare_loop(&block) }
-          loop { @timer.wait }
+          @timer = @timers.now_and_every(@time_to_live) { prepare_loop(&block) }
+          loop { @timers.wait }
         rescue
           raise Errors::Janus::KeepaliveTimer::LoopKeepalive
         end
@@ -43,7 +43,6 @@ module RubyRabbitmqJanus
         def session(&block)
           Timeout.timeout(@time_to_die) { yield }
         rescue Timeout::Error
-          stop_timer
           block.binding.receiver.instance_is_down
         rescue
           raise Errors::Janus::KeepaliveTimer::Session
@@ -51,18 +50,11 @@ module RubyRabbitmqJanus
 
         # Stop timer to keepalive thread
         def stop_timer
-          @timer.pause
+          @timer.cancel
         rescue
           raise Errors::Janus::KeepaliveTimer::StopTimer
         end
 
-        # Start timer to keepalive thread
-        def start_timer
-          @timer.resume
-        rescue
-          raise Errors::Janus::KeepaliveTimer::StartTimer
-        end
-
         private
 
         def prepare_loop(&block)
@@ -70,7 +62,6 @@ module RubyRabbitmqJanus
             block.binding.receiver.restart_session if yield
           end
         rescue Timeout::Error
-          stop_timer
           block.binding.receiver.instance_is_down
         end
 

data/lib/rrj/models/concerns/janus_instance_callbacks.rb

@@ -27,7 +27,7 @@ module RubyRabbitmqJanus
       # Destroy a session in Janus Instance
       def callback_destroy_after
         Tools::Log.instance.debug 'Callback AFTER_DESTROY'
-        destroy_a_session_in_janus_instance if enable && session? && thread?
+        #LCO: nothing to do, thread will close session and die
       end
 
       private
@@ -35,13 +35,11 @@ module RubyRabbitmqJanus
       def create_a_session_in_janus_instance
         info_instance('Create session')
         janus_instance = keepalive_object_new
-        set(session: janus_instance.session, thread: janus_instance.thread_id)
+        set(session: janus_instance.session)
       end
 
       def destroy_a_session_in_janus_instance
-        info_instance('Destroy session')
-        keepalive_object_thread.send(:response_destroy)
-        keepalive_object_thread.kill
+        info_instance('Detaching session')
         unset(%I[thread session])
       end
 
@@ -50,7 +48,7 @@ module RubyRabbitmqJanus
       end
 
       def keepalive_object_new
-        keepalive_object.new(instance)
+        keepalive_object.new(self)
       end
 
       def keepalive_object_thread

data/spec/spec_helper.rb

@@ -59,7 +59,7 @@ RSpec.configure do |config|
 
   # Configure Initializer RRJ and create session with Janus Instance
   config.before(:example) do |example|
-    unless example.metadata[:type].match?(/thread/) || example.metadata[:type].match?(/tools/)
+    unless example.metadata[:type].match?(/tools/)
       after_load_database
       initializer_rrj(example.metadata)
       clear

data/spec/thread/keepalive_initializer_spec.rb

@@ -3,9 +3,8 @@
 require 'spec_helper'
 
 describe RubyRabbitmqJanus::Janus::Concurrencies::KeepaliveThread, type: :thread, name: :keepalive_initializer do
-  let(:instance) { [1, 2].sample }
+  let(:instance) { RubyRabbitmqJanus::Models::JanusInstance.find((ENV['MONGO'].match?('true')? ['1','2']:[1,2]).sample) }
   let(:concurrency) { RubyRabbitmqJanus::Janus::Concurrencies::KeepaliveInitializer.new(instance) }
-
   it { expect(concurrency.send(:rabbit)).to be_a(RubyRabbitmqJanus::Rabbit::Connect) }
   it { expect(concurrency.send(:lock)).to be_a(Mutex) }
   it { expect(concurrency.send(:condition)).to be_a(ConditionVariable) }

data/spec/thread/keepalive_thread_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe RubyRabbitmqJanus::Janus::Concurrencies::KeepaliveThread, type: :thread, name: :keepalive_thread do
-  let(:instance) { [1, 2].sample }
+  let(:instance) { RubyRabbitmqJanus::Models::JanusInstance.find((ENV['MONGO'].match?('true')? ['1','2']:[1,2]).sample) }
   let(:rabbit) { RubyRabbitmqJanus::Janus::Concurrencies::Concurrency.new.send(:rabbit) }
   let(:concurrency) { RubyRabbitmqJanus::Janus::Concurrencies::KeepaliveThread.new(instance, rabbit) { nil } }
 

data/spec/thread/keepalive_timer_spec.rb

@@ -7,6 +7,6 @@ describe RubyRabbitmqJanus::Janus::Concurrencies::KeepaliveTimer, type: :thread,
 
   it { expect(concurrency.send(:time_to_live)).to be_a(Integer) }
   it { expect(concurrency.send(:time_to_die)).to be_a(Integer) }
-  it { expect(concurrency.instance_variable_get(:@timer)).to be_a(Timers::Group) }
+  it { expect(concurrency.instance_variable_get(:@timers)).to be_a(Timers::Group) }
   it { expect(concurrency.instance_variable_get(:@time_to_live)).to eql(RubyRabbitmqJanus::Tools::Config.instance.options['janus']['session']['keepalive']) }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_rabbitmq_janus
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.0.pre.170
 platform: ruby
 authors:
 - VAILLANT Jeremy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-21 00:00:00.000000000 Z
+date: 2018-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -612,9 +612,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.2