ruby_rabbitmq_janus 2.6.0.pre.244 → 2.6.0.pre.246

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cb3089fb50dc4ce5729eba2c73dbc968b6ede2bf408b42bfca23f01d600e244
-  data.tar.gz: c11c4c29bcc1a381ec2f7ddb32bbfa9f2981306c173996c3d2ee3a2f6f6e8388
+  metadata.gz: 91b38bd476021288dadfc1a47a4c2226d5690544b9993542944dd1f9f18759c7
+  data.tar.gz: 68afeed194a61a7a0fc43398cf798bc95f59041fad368de7f54cbab9535310fe
 SHA512:
-  metadata.gz: e5cdf174fae030439acf0d96d207dac5b05ac3210bd98d8e00dd502a88940d7817ea119f8c193aeb8107a0dd73fe2bf583b1af34c710e2300ddf886b21f4018f
-  data.tar.gz: 1534b1922a5ce801940d430002c32adb56e3e3d31d469145a27ea849c343c72cf133a63b7303e0bb2a2fe2023ab0da4c886244361b9020c34308289a5a2dca75
+  metadata.gz: a7eade36b3abe79be1d5f56dc19328b86c01fd8b156285819aeaab34e1d3a7dd822fad37ec741face0c5974fe2426ced0d02c9c694e5be399d16a20d9bed6876
+  data.tar.gz: 795ee29c47503a800ab093cf1d51852a897f326066be3ace3c3e9803b6b02b37b848b1a74948bf5b5833ea10fd78207ee839360e77a89a3e23b0a6cca55c8f64

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

@@ -12,7 +12,6 @@ module RubyRabbitmqJanus
         # @param [String] rabbit Information connection to rabbitmq server
         def initialize(rabbit)
           super()
-          @responses = []
           @rabbit = rabbit.channel
           subscribe_queue
         rescue
@@ -24,7 +23,7 @@ module RubyRabbitmqJanus
           semaphore.wait
           response = nil
           lock.synchronize do
-            response = @responses.shift
+            response = responses.shift
           end
           yield response.event, response
         rescue => exception
@@ -34,6 +33,8 @@ module RubyRabbitmqJanus
 
         private
 
+        attr_accessor :rabbit, :responses
+
         def binding
           @rabbit.direct('amq.direct')
         end
@@ -48,15 +49,6 @@ module RubyRabbitmqJanus
           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)
-          lock.synchronize do
-            @responses.push(Janus::Responses::Event.new(JSON.parse(payload)))
-          end
-          @rabbit.acknowledge(info.delivery_tag, false)
-          semaphore.signal
-        end
-
         def info_subscribe(info, prop, payload)
           Tools::Log.instance.debug info
           Tools::Log.instance.info \

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

@@ -15,8 +15,8 @@ module RubyRabbitmqJanus
         private
 
         def subscribe_queue
-          reply = @rabbit.queue(Tools::Config.instance.queue_from)
-          @rabbit.prefetch(1)
+          reply = rabbit.queue(Tools::Config.instance.queue_from)
+          rabbit.prefetch(1)
           reply.bind(binding).subscribe(opts_subs) do |info, prop, payload|
             info_subscribe(info, prop, payload)
             synchronize_response(info, payload)
@@ -25,6 +25,15 @@ module RubyRabbitmqJanus
           raise RubyRabbitmqJanus::Errors::Rabbit::Listener::From::ListenEvents,
                 exception
         end
+
+        def synchronize_response(info, payload)
+          lock.synchronize do
+            response = Janus::Responses::Event.new(JSON.parse(payload))
+            responses.push(response)
+          end
+          rabbit.acknowledge(info.delivery_tag, false)
+          semaphore.signal
+        end
       end
     end
   end

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

@@ -10,8 +10,8 @@ module RubyRabbitmqJanus
         private
 
         def subscribe_queue
-          reply = @rabbit.queue(Tools::Config.instance.queue_admin_from)
-          @rabbit.prefetch(1)
+          reply = rabbit.queue(Tools::Config.instance.queue_admin_from)
+          rabbit.prefetch(1)
           reply.bind(binding).subscribe(opts_subs) do |info, prop, payload|
             info_subscribe(info, prop, payload)
             synchronize_response(info, payload)
@@ -20,6 +20,14 @@ module RubyRabbitmqJanus
           raise RubyRabbitmqJanus::Errors::Rabbit::Listener::From::ListenEvents,
                 exception
         end
+
+        def synchronize_response(info, payload)
+          lock.synchronize do
+            @responses.push(Janus::Responses::Admin.new(JSON.parse(payload)))
+          end
+          rabbit.acknowledge(info.delivery_tag, false)
+          semaphore.signal
+        end
       end
     end
   end

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

@@ -8,12 +8,12 @@ module RubyRabbitmqJanus
       # :reek:InstanceVariableAssumption
 
       # Listener to admin queue
-      class JanusInstance < From
+      class JanusInstance < Base
         private
 
         def subscribe_queue
-          reply = @rabbit.queue(Tools::Config.instance.queue_janus_instance)
-          @rabbit.prefetch(1)
+          reply = rabbit.queue(Tools::Config.instance.queue_janus_instance)
+          rabbit.prefetch(1)
           reply.bind(binding).subscribe(opts_subs) do |info, prop, payload|
             info_subscribe(info, prop, payload)
             synchronize_response(info, payload)
@@ -27,9 +27,9 @@ module RubyRabbitmqJanus
         def synchronize_response(info, payload)
           lock.synchronize do
             response = Janus::Responses::JanusInstance.new(JSON.parse(payload))
-            @responses.push(response)
+            responses.push(response)
           end
-          @rabbit.acknowledge(info.delivery_tag, false)
+          rabbit.acknowledge(info.delivery_tag, false)
           semaphore.signal
         end
       end

data/lib/rrj/tools/bin/environment.rb

@@ -2,10 +2,18 @@
 
 # Load environment variables for execute correctly `Binary` class
 
-ENVIRONMENT = ENV['RAILS_ENV']
-ORM = ENV['ORM']
-LISTENER_PATH = ENV['LISTENER_PATH']
-PROGRAM = ENV['PROGRAM_NAME']
+def blank?(value)
+  value.eql?('') || value.nil?
+end
+
+def check_variable(name)
+  blank?(ENV[name]) ? raise(NameError) : ENV[name]
+end
+
+ENVIRONMENT = check_variable('RAILS_ENV')
+ORM = check_variable('ORM')
+LISTENER_PATH = check_variable('LISTENER_PATH')
+PROGRAM = check_variable('PROGRAM_NAME')
 
 @verbose = false
 @logger_class = true

data/lib/rrj/tools/bin/init.rb

@@ -21,7 +21,21 @@ Log.info RubyRabbitmqJanus::BANNER
 require File.join(File.dirname(__FILE__), '..', '..', 'binary')
 
 begin
+  Log.info 'Load events public queue classes'
   bin = RubyRabbitmqJanus::Binary.new
+  Log.info "Load file : #{File.join(Dir.pwd, LISTENER_PATH)}"
+  require File.join(Dir.pwd, LISTENER_PATH)
+
+  Log.info 'Listen public queue in thread'
+  actions = RubyRabbitmqJanus::ActionEvents.new.actions
+  RubyRabbitmqJanus::Janus::Concurrencies::Event.instance.run(&actions)
+rescue => exception
+  Log.fatal '!! Fail to start RRJ Thread listen public queue !!'
+  Log.fatal exception
+  exit 1
+end
+
+begin
   Log.info \
     'Prepare to listen events in queue : ' + \
     RubyRabbitmqJanus::Tools::Config.instance.queue_janus_instance
@@ -37,7 +51,7 @@ begin
     end
   end
 rescue => exception
-  Log.fatal '!! Fail to start RRJ threads !!'
+  Log.fatal '!! Fail to start RRJ Thread Janus Instance management !!'
   Log.fatal exception
   exit 1
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_rabbitmq_janus
 version: !ruby/object:Gem::Version
-  version: 2.6.0.pre.244
+  version: 2.6.0.pre.246
 platform: ruby
 authors:
 - VAILLANT Jeremy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-19 00:00:00.000000000 Z
+date: 2019-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord