ruby_rabbitmq_janus 2.2.0 → 2.2.1.pre.180

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f34cad1c72e7d7cb5737f806b66824a28f2ec84
-  data.tar.gz: ca95c3126aaf6f29cbb7b8c9dfcd4d7312a876bb
+  metadata.gz: 8d1231f2f5d34994a2952bbcf7d698d6bb560354
+  data.tar.gz: 91061eb621ed490eff870d9f9dc38fcb181e0490
 SHA512:
-  metadata.gz: 077915cb4fb54a3d028202f4c953c105584c9c228c97fa54410ad1e47e37bb730fe0867ea26b5facfa49b0cd5e2450b85ba16266037728e4bd9664e84ae8f9d5
-  data.tar.gz: 61b33fab6237bb0b9c59d71d9b7fe48d87d1c14c5691f9048b26e24c4499748aa4233b634e21940f4d1a00eabfbef3ebceebfb7d4d716c8a730efbec1c3b06a2
+  metadata.gz: a605a1bb670e7a0a87d38e8179fd38d2cd090b8cb6581a5f7af2ec47dba6d021b320882a7b00663dd3d8603a797ade50ff424e3e3a6dce033165ea433988cad9
+  data.tar.gz: 74011ff5c13e91f8d108a7a34bfefe51e328cac6904a2a9539a3c79f8d12e2f248756964b0db7f9fca50be3e0351eba0789ef62e8284f3a7d3ed4c933dd27e8e

data/lib/rrj/errors/janus/processus/keepalive/initializer.rb

@@ -18,6 +18,12 @@ module RubyRabbitmqJanus
           end
         end
 
+        class ID2ref < RubyRabbitmqJanus::Errors::Janus::BaseKeepaliveInitializer
+          def initialize(thread_id)
+            super "No thread with ID : #{thread_id}"
+          end
+        end
+
         class Session < RubyRabbitmqJanus::Errors::Janus::BaseKeepaliveInitializer
           def initialize
             super 'Error return session number'

data/lib/rrj/errors/rabbit/publish/publisher.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# :reek:IrresponsibleModule
+#
 module RubyRabbitmqJanus
   module Errors
     module Rabbit
@@ -24,6 +26,12 @@ module RubyRabbitmqJanus
             super 'Error for publish message'
           end
         end
+
+        class Testcorrelation < RubyRabbitmqJanus::Errors::Rabbit::BasePublish
+          def initialize(message, propertie)
+            super "Response correlation ID mismatch (#{message} != #{propertie})", :fatal
+          end
+        end
       end
     end
   end

data/lib/rrj/info.rb

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

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

@@ -26,7 +26,7 @@ module RubyRabbitmqJanus
         def self.thread(thread)
           ObjectSpace._id2ref(thread)
         rescue RangeError
-          Tools::Log.instance.fatal "No thread with ID : #{thread}"
+          raise Errors::Janus::KeepaliveInitializer::ID2Ref, thread
         end
 
         # Give a session Integer  his gem is instantiate.

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

@@ -34,9 +34,9 @@ module RubyRabbitmqJanus
         # Restart session
         def restart_session
           Tools::Log.instance.warn 'Restart session ...'
-          @session = response_session
-          response_keepalive
-          find_model.set(session: @session)
+          janus = find_model
+          send_messages_restart
+          janus.set(session: @session)
         rescue
           raise Errors::Janus::KeepaliveThread::RestartSession
         end
@@ -76,6 +76,11 @@ module RubyRabbitmqJanus
 
         attr_reader :instance
 
+        def send_messages_restart
+          @session = response_session
+          response_keepalive
+        end
+
         def prepare_kill_thread
           @session = @message = nil
           KeepaliveThread.instance_method(:kill).bind(self).call

data/lib/rrj/rabbit/publish/publisher.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# rubocop:disable Style/GuardClause
+
 module RubyRabbitmqJanus
   module Rabbit
     module Publisher
@@ -37,12 +39,8 @@ module RubyRabbitmqJanus
 
         def subscribe_to_queue
           reply.subscribe do |_delivery_info, propertie, payload|
-            propertie_correlation = p_correlation(propertie)
-            if m_correlation.eql?(propertie_correlation)
+            test_correlation(m_correlation, p_correlation(propertie)) do
               synchronize(payload)
-            else
-              Tools::Log.instance.error 'Response correlation ID mismatch (' \
-                "#{m_correlation}!=#{propertie_correlation})"
             end
           end
         end
@@ -55,6 +53,14 @@ module RubyRabbitmqJanus
           propertie.correlation_id
         end
 
+        def test_correlation(m_cor, p_cor)
+          if m_cor.eql?(p_cor)
+            yield
+          else
+            raise Errors::Rabbit::Publish::TestCorrelation, m_cor, p_cor
+          end
+        end
+
         def synchronize(payload)
           lock.synchronize do
             responses.push(JSON.parse(payload))
@@ -67,6 +73,7 @@ module RubyRabbitmqJanus
     end
   end
 end
+# rubocop:enable Style/GuardClause
 
 require 'rrj/rabbit/publish/admin'
 require 'rrj/rabbit/publish/exclusive'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_rabbitmq_janus
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1.pre.180
 platform: ruby
 authors:
 - VAILLANT Jeremy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-14 00:00:00.000000000 Z
+date: 2017-09-15 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.6.13