ruby_rabbitmq_janus 3.0.0.pre.334 → 3.0.0.pre.335

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dab52d2ea0ff5412d2747cc0a35d0f5ad2d4e39fbe5080df7f7b6909781d152e
-  data.tar.gz: 673e03c92bd18201acc0d25eb001dc0f9876b654991c4111229bebf154f53b41
+  metadata.gz: c3fe2a3db13d059388205ab8b00b1abf9d3f2df69b6cd4429de351bdfcaa84fa
+  data.tar.gz: 6f744f5aeb97d5b6983d95e4016a9665969d5c97de9f2def000d60e69d7fc005
 SHA512:
-  metadata.gz: 9034e88142324ef2de0aaee27db832d80fff227fe62e31c06eef8c72ca73f4f152632e5c472118368a74b54a1e02bc64844b5db7201ad2b1e8899fda03c3f328
-  data.tar.gz: '068051edf6efdcaf97658f503bb4c6f86463e0483398b61e49b0f0e8af5187d551f7876a31c874e7b92ca96f508260caaab33dc5170ecdc0cde3fb065303aee2'
+  metadata.gz: d2019a5c5a40a2ec666f07c293daad9eacae6727a1b0fad53c3d36bdcc1b62ffa5fe510ab65d836aa8e5c197c3e48361c8a33de6b4966b32cfea1a5db42e8b88
+  data.tar.gz: bc5a22eab7f07b5b3d8bc7b448787902ccf7fe2ea074bb63eda0d6d11d80eeb1da7dd61e1525079befb1c4516c40f0ca60fb8e96df95cdb3210c9f4efd6d304f

data/lib/rrj/errors/process/concurency.rb

@@ -10,6 +10,13 @@ module RubyRabbitmqJanus
         end
       end
 
+      # Define a super class for all error in Process::Concurency::Event class
+      class BaseEvent < RubyRabbitmqJanus::Errors::Process::BaseConcurency
+        def initialize(class_name, message)
+          super "[#{class_name}] #{message}"
+        end
+      end
+
       module Concurency
         # Error for Process::Concurency#initialize
         class Initializer < RubyRabbitmqJanus::Errors::Process::BaseConcurency
@@ -22,5 +29,5 @@ module RubyRabbitmqJanus
   end
 end
 
-require 'rrj/errors/process/keepalive'
 require 'rrj/errors/process/event'
+require 'rrj/errors/process/event_admin'

data/lib/rrj/errors/process/event.rb

@@ -3,25 +3,18 @@
 module RubyRabbitmqJanus
   module Errors
     module Process
-      # Define a super class for all error in Process::Concurency::Event class
-      class BaseEvent < RubyRabbitmqJanus::Errors::Process::BaseConcurency
-        def initialize(message)
-          super "[Event] #{message}"
-        end
-      end
-
       module Event
-        # Error for Process::Concurency::Event#initialize
+        # Error for Process::Concurrencies::Event#initialize
         class Initializer < RubyRabbitmqJanus::Errors::Process::BaseEvent
           def initializer
-            super 'Error Event initializer'
+            super 'Event', 'Error Event initializer'
           end
         end
 
-        # Error for Process::Concurency::Event#run
+        # Error for Process::Concurrencies::Event#run
         class Run < RubyRabbitmqJanus::Errors::Process::BaseEvent
           def initializer
-            super 'Error running block code'
+            super 'Event', 'Error Event runner block code'
           end
         end
       end

data/lib/rrj/errors/process/event_admin.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module RubyRabbitmqJanus
+  module Errors
+    module Process
+      module EventAdmin
+        # Error for Process::Concurrencies::EventAdmin#initialize
+        class Initializer < RubyRabbitmqJanus::Errors::Process::BaseEvent
+          def initializer
+            super 'EventAdmin', 'Error EventAdmin initializer'
+          end
+        end
+
+        # Error for Process::Concurrencies::EventAdmin#run
+        class Run < RubyRabbitmqJanus::Errors::Process::BaseEvent
+          def initializer
+            super 'EventAdmin', 'Error EventAdmin runner block code'
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
-# :reek:IrresponsibleModule
-
 module RubyRabbitmqJanus
   module Errors
     module Rabbit
       module Listener
+        # Base class error for listeners
         class BaseError < BaseRabbit
           def initialize(message, level = :fatal)
             super("[Listener] #{message}", level)
@@ -13,15 +12,24 @@ module RubyRabbitmqJanus
         end
 
         module Base
+          # Error initializer for listeners
           class Initialize < RubyRabbitmqJanus::Errors::Rabbit::Listener::BaseError
             def initialize
               super 'Error in initialize'
             end
           end
 
+          # Error listen event
           class ListenEvents < RubyRabbitmqJanus::Errors::Rabbit::Listener::BaseError
-            def initialize
-              super "Error when listen events to queue 'janus-instance-thread'"
+            def initialize(queue)
+              super "Error when listen events to queue '#{queue}'"
+            end
+          end
+
+          # Error when response is read by a listener
+          class ResponseEmpty < RubyRabbitmqJanus::Errors::Rabbit::Listener::BaseError
+            def initialize(response)
+              super "Response is empty ! (#{response})"
             end
           end
         end

data/lib/rrj/errors/tools/gem/config.rb

@@ -56,12 +56,6 @@ module RubyRabbitmqJanus
           end
         end
 
-        class RabbitTester < RubyRabbitmqJanus::Errors::Tools::BaseConfig
-          def initialize
-            super '[RabbitTester] Error for reading option rabbitmq tester', :warn
-          end
-        end
-
         class AdminPassword < RubyRabbitmqJanus::Errors::Tools::BaseConfig
           def initialize
             super '[AdminPassword] Error for reading option admin password', :warn
@@ -115,6 +109,12 @@ module RubyRabbitmqJanus
             super '[ProgramName] Error with ProgramName option', :fatal
           end
         end
+
+        class Rabbitmq < RubyRabbitmqJanus::Errors::Tools::BaseConfig
+          def initialize(value)
+            super "[RabbitMQConfig] Missing RabbitMQ configuration for key : #{value}", :fatal
+          end
+        end
       end
     end
   end

data/lib/rrj/process/event_admin.rb

@@ -18,7 +18,7 @@ module RubyRabbitmqJanus
           super
           @thread = Thread.new { initialize_thread }
         rescue
-          raise Errors::Process::Event::Initializer
+          raise Errors::Process::EventAdmin::Initializer
         end
 
         # Create a thread for execute a block code in a thread
@@ -36,7 +36,7 @@ module RubyRabbitmqJanus
             end
           end
         rescue
-          raise Errors::Process::Event::Run
+          raise Errors::Process::EventAdmin::Run
         end
 
         private

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

@@ -24,10 +24,12 @@ module RubyRabbitmqJanus
           response = nil
           lock.synchronize do
             response = responses.shift
+            raise Errors::Rabbit::Listener::ResponseEmpty, response \
+              if response.size.zero?
           end
           yield response.event, response
         rescue
-          raise Errors::Rabbit::Listener::Base::ListenEvents
+          raise Errors::Rabbit::Listener::Base::ListenEvents, reply
         end
 
         private

data/lib/rrj/tools/gem/config/rabbit.rb

@@ -23,12 +23,20 @@ module RubyRabbitmqJanus
       # @return [Hash] Format hash for bunny settings
       def server_settings
         Hash[%w[host port pass user vhost log_level].map do |value|
-          [
-            value.to_sym,
-            @options['rabbit'][value.eql?('log_level') ? 'level' : value]
-          ]
+          key = value.to_sym
+          j_value = @options['rabbit'][rabbitmq_conf(value)]
+
+          raise Errors::Tools::Config::Rabbitmq value if j_value.blank?
+
+          [key, j_value]
         end]
       end
+
+      private
+
+      def rabbitmq_conf(value)
+        value.eql?('log_level') ? 'level' : value
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_rabbitmq_janus
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.334
+  version: 3.0.0.pre.335
 platform: ruby
 authors:
 - VAILLANT Jeremy
@@ -453,10 +453,7 @@ files:
 - lib/rrj/errors/janus/transactions/transaction.rb
 - lib/rrj/errors/process/concurency.rb
 - lib/rrj/errors/process/event.rb
-- lib/rrj/errors/process/keepalive.rb
-- lib/rrj/errors/process/keepalive/initializer.rb
-- lib/rrj/errors/process/keepalive/thread.rb
-- lib/rrj/errors/process/keepalive/timer.rb
+- lib/rrj/errors/process/event_admin.rb
 - lib/rrj/errors/rabbit/base_event.rb
 - lib/rrj/errors/rabbit/connect.rb
 - lib/rrj/errors/rabbit/listener/base.rb

data/lib/rrj/errors/process/keepalive.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-# @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
-# @see RubyRabbitmqJanus::Janus::Keepalive Keepalive thread
-
-module RubyRabbitmqJanus
-  module Errors
-    module Process
-      # Define a super class for all error in Process::Concurency::Keepalive
-      class BaseKeepalive < RubyRabbitmqJanus::Errors::Process::BaseConcurency
-        def initialize(message)
-          super "[Keepalive]#{message}"
-        end
-      end
-    end
-  end
-end
-
-require 'rrj/errors/process/keepalive/initializer'
-require 'rrj/errors/process/keepalive/thread'
-require 'rrj/errors/process/keepalive/timer'

data/lib/rrj/errors/process/keepalive/initializer.rb

@@ -1,59 +0,0 @@
-# frozen_string_literal: true
-
-# :reek:IrresponsibleModule
-
-module RubyRabbitmqJanus
-  module Errors
-    module Process
-      class BaseKeepaliveInitializer < BaseKeepalive
-        def initialize(message)
-          super "[Initializer] #{message}"
-        end
-      end
-
-      module KeepaliveInitializer
-        class Initializer < RubyRabbitmqJanus::Errors::Process::BaseKeepaliveInitializer
-          def initialize
-            super 'Error keepalive initializer'
-          end
-        end
-
-        class ID2ref < RubyRabbitmqJanus::Errors::Process::BaseKeepaliveInitializer
-          def initialize(thread_id)
-            super "No thread with ID : #{thread_id}"
-          end
-        end
-
-        class Session < RubyRabbitmqJanus::Errors::Process::BaseKeepaliveInitializer
-          def initialize
-            super 'Error return session number'
-          end
-        end
-
-        class Thread < RubyRabbitmqJanus::Errors::Process::BaseKeepaliveInitializer
-          def initialize
-            super 'Error for get Object Thread ID'
-          end
-        end
-
-        class ThreadStart < RubyRabbitmqJanus::Errors::Process::BaseKeepaliveInitializer
-          def initialize
-            super 'Error for starting timer in thread'
-          end
-        end
-
-        class ThreadStop < RubyRabbitmqJanus::Errors::Process::BaseKeepaliveInitializer
-          def initialize
-            super 'Error for stoping timer in thread'
-          end
-        end
-
-        class ThreadDelete < RubyRabbitmqJanus::Errors::Process::BaseKeepaliveInitializer
-          def initialize
-            super 'Error for destroy thread'
-          end
-        end
-      end
-    end
-  end
-end

data/lib/rrj/errors/process/keepalive/thread.rb

@@ -1,54 +0,0 @@
-# frozen_string_literal: true
-
-# :reek:IrresponsibleModule
-
-module RubyRabbitmqJanus
-  module Errors
-    module Process
-      # Define a super class for all error in Process::Concurency::Keepalive
-      class BaseKeepaliveThread < BaseKeepalive
-        def initialize(message)
-          super "[Thread] #{message}"
-        end
-      end
-
-      module KeepaliveThread
-        class Initializer < RubyRabbitmqJanus::Errors::Process::BaseKeepaliveThread
-          def initialize
-            super 'Error for initialize Keepalive Thread'
-          end
-        end
-
-        class InitializeJanusSession < RubyRabbitmqJanus::Errors::Process::BaseKeepaliveThread
-          def initialize
-            super 'Error when initialize message in keepalive thread'
-          end
-        end
-
-        class RestartSession < RubyRabbitmqJanus::Errors::Process::BaseKeepaliveThread
-          def initialize
-            super 'Error when restart session'
-          end
-        end
-
-        class Start < RubyRabbitmqJanus::Errors::Process::BaseKeepaliveThread
-          def initialize
-            super 'Error when start a loop for sending keepalive message'
-          end
-        end
-
-        class Kill < RubyRabbitmqJanus::Errors::Process::BaseKeepaliveThread
-          def initialize
-            super 'Error when killing thread'
-          end
-        end
-
-        class InstanceIsDown < RubyRabbitmqJanus::Errors::Process::BaseKeepaliveThread
-          def initialize
-            super 'Error when instance is down'
-          end
-        end
-      end
-    end
-  end
-end

data/lib/rrj/errors/process/keepalive/timer.rb

@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-
-# :reek:IrresponsibleModule
-
-module RubyRabbitmqJanus
-  module Errors
-    module Process
-      class BaseKeepaliveTimer < BaseKeepalive
-        def initialize(message)
-          super "[Timer] #{message}"
-        end
-      end
-
-      module KeepaliveTimer
-        class Initializer < RubyRabbitmqJanus::Errors::Process::BaseKeepaliveTimer
-          def initialize
-            super 'Error for initialize Keepalive Timer'
-          end
-        end
-
-        class LoopKeepalive < RubyRabbitmqJanus::Errors::Process::BaseKeepaliveTimer
-          def initialize
-            super 'Loop for create timer in Keepalive Thread is failed'
-          end
-        end
-
-        class Session < RubyRabbitmqJanus::Errors::Process::BaseKeepaliveTimer
-          def initialize
-            super 'Timeout for get session number in keepalive request'
-          end
-        end
-
-        class StopTimer < RubyRabbitmqJanus::Errors::Process::BaseKeepaliveTimer
-          def initialize
-            super 'Error when timer to Keepalive Thread stop'
-          end
-        end
-
-        class StartTimer < RubyRabbitmqJanus::Errors::Process::BaseKeepaliveTimer
-          def initialize
-            super 'Error when timer to Keepalive Thread start'
-          end
-        end
-      end
-    end
-  end
-end