ruby_rabbitmq_janus 2.2.0.pre.177 → 2.2.0.pre.179

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61b709556d831e3c858e1293e2046278c67866a5
-  data.tar.gz: 77303b8410e0fdceb79b0049a474b46acdf1eeb9
+  metadata.gz: cc2b31862c0708c674e7a21f98ae77061baaa722
+  data.tar.gz: 2b771ef4c51d25bde097b7e4ced7e2b94f99932d
 SHA512:
-  metadata.gz: 84fab7ef2ea0b7b1d696f48d54ca1ea07f040a2e9429bf44c5e08965abe7c3cdc8fb121e91c15ab23924d2562c76995a96cba23d80efefaf649020d9a2a0ee60
-  data.tar.gz: ec09f77a95304c0a774d554af089c249f0c0cd2a28c0c81968c217c8e80b39367e306b9445c2e37531462f099ccfc5239243977c88f9c2900425640b1e758b70
+  metadata.gz: a24227cb75c670aa8ec50c8954787b05ad66adf2706533f305556fb1ffa6f63c34e9f77f2e894bfc2d2f440aba7619f9082b519ffae4d73e433364a4556636ae
+  data.tar.gz: da9961ca948a7d237d7266911ed4e2234b8d926d4fa264aa411caa0363875a7ecd0962ce59a0f4e79243ed84d7f3bd1a4f4b75876516e5a064573da6d492a8be

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/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.pre.177
+  version: 2.2.0.pre.179
 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