ruby_rabbitmq_janus 1.2.8 → 1.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f476513f5e5d4c4e80d79a6744d57742d50c523e
-  data.tar.gz: 929e04e9429877f21cdedaa4ad7b5461e8ddf54a
+  metadata.gz: 9e7097b3084bdf28a6ca3d98594bf42b6ec88a11
+  data.tar.gz: 12039167df87de0454f6b47f81764392e0b5cb92
 SHA512:
-  metadata.gz: 77f0c437d77862d84f9492e27ab27f497fe674fd1ce419d670a21944cf920b21af3a49f3cdcec22f500b8d47b6ce045e5bc4c02c7e8fdefdd1fa2ad8590fd5c7
-  data.tar.gz: 90bf97502d8770c33bc5383969eb53e7968469f11d4509b6e2a17b20beb509dc4ddec6d240ff17d98a98773ebcbb6fcf859801ecf2ca75ee6d62aa530ac12b62
+  metadata.gz: 515d7007165d7a1e53485b27bb75265aa5522ebf876655c07945c789efef28cd3ec99071543d8c7062df8c62fe4611d2aa30107ccbd66bf84e74f0b5e7c341da
+  data.tar.gz: 58611d01139e576079557531897b65c24b80e275cce625e519358c263c91432d09cfbd45d6acac4542cd8e862ba96fe6c6c42356e4a25192d60a483e67e92efb

data/lib/rrj/info.rb

@@ -5,7 +5,7 @@
 # Define constant to gem.
 module RubyRabbitmqJanus
   # Define version to gem
-  VERSION = '1.2.8'
+  VERSION = '1.2.9'
 
   # Name to gem
   GEM_NAME = 'ruby_rabbitmq_janus'

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require 'semaphore'
 
 module RubyRabbitmqJanus
   module Rabbit
@@ -15,13 +16,13 @@ module RubyRabbitmqJanus
       #
       # @abstract Publish message in RabbitMQ
       class BasePublisher
-        attr_reader :response
+        attr_reader :responses
 
         # Define a base publisher
         def initialize
           Tools::Log.instance.debug 'Create an publisher'
-          @response = nil
-          @condition = ConditionVariable.new
+          @responses = []
+          @semaphore= Semaphore.new
           @lock = Mutex.new
         end
 
@@ -31,11 +32,14 @@ module RubyRabbitmqJanus
 
         # return an response when signal is trigger
         def return_response
+          Tools::Log.instance.debug 'Waiting response...'
+          @semaphore.wait
+          Tools::Log.instance.debug 'Response received'
+          response = nil
           @lock.synchronize do
-            Tools::Log.instance.debug 'Response received'
-            @condition.wait(@lock)
-            @response
+            response = @responses.shift
           end
+          response
         end
       end
     end

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

@@ -13,18 +13,21 @@ module RubyRabbitmqJanus
         # @param [String] rabbit Information connection to rabbitmq server
         def initialize(rabbit)
           super()
+          @responses = []
           @rabbit = rabbit.channel
-          @response = nil
           subscribe_queue
         end
 
         # Listen a queue and return a body response
         def listen_events
+          Tools::Log.instance.debug 'Waiting event...'
+          @semaphore.wait
+          Tools::Log.instance.info 'Janus event received .. treatment ..'
+          response = nil
           lock.synchronize do
-            condition.wait(lock)
-            Tools::Log.instance.info 'Janus event received .. treatment ..'
-            yield @response.event, @response
+            response = @responses.shift
           end
+          yield response.event, response
         end
 
         private
@@ -56,15 +59,16 @@ module RubyRabbitmqJanus
         # Counts transmitted messages
         def log_message_id(propertie)
           message_id = propertie.message_id
-          Tools::Log.instance.info "[X] Message reading with ID ##{message_id}"
+          Tools::Log.instance.info "[X] Message reading with ID #{message_id}"
         end
 
         # Sending an signal when an response is reading in queue
         def synchronize_response(info, payload)
-          sleep 0.2
-          @response = Janus::Responses::Event.new(JSON.parse(payload))
+          lock.synchronize do
+            @responses.push(Janus::Responses::Event.new(JSON.parse(payload)))
+          end
           @rabbit.acknowledge(info.delivery_tag, false)
-          lock.synchronize { condition.signal }
+          @semaphore.signal
         end
       end
     end

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

@@ -39,8 +39,14 @@ module RubyRabbitmqJanus
         def subscribe_to_queue
           reply.subscribe do |_delivery_info, propertie, payload|
             if @message.correlation.eql?(propertie.correlation_id)
-              @response = JSON.parse payload
-              lock.synchronize { condition.signal }
+              Tools::Log.instance.debug "Parsing response payload......"
+              lock.synchronize do
+                @responses.push(JSON.parse payload)
+              end
+              Tools::Log.instance.debug "Response payload is: #{payload}"
+              @semaphore.signal
+            else
+              Tools::Log.instance.error "Response correlation ID mismatch (#{@message.correlation}!=#{propertie.correlation_id})"
             end
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_rabbitmq_janus
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.2.9
 platform: ruby
 authors:
 - VAILLANT Jeremy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-27 00:00:00.000000000 Z
+date: 2017-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -278,6 +278,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.2
+- !ruby/object:Gem::Dependency
+  name: semaphore
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
 description: |
   This gem is used to communicate to a server Janus through RabbitMQ software
   (Message-oriented middleware). It waiting a messages to Rails API who send to