ruby_rabbitmq_janus 2.1.1 → 2.2.0.pre.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16df5ab4b2d2425a330c7aa2a5d6a53504bfe9a7
-  data.tar.gz: ecaae36f0768b95b8a39d6607b89dff66ff245d2
+  metadata.gz: d5f7f8a44b723ed992abbde848a25695bc35df85
+  data.tar.gz: 1c4069bc56dd828876f35e3ed9041f78ee1addfd
 SHA512:
-  metadata.gz: 1842090e0975c39a141d3b3a3567afd9c027e1035e4ef643fb9ab59cf0af1fd487d1629d4fd4c1c82f1113ef4c94f3391f97a13bbdf3354dd066fddb581f5f15
-  data.tar.gz: 62986f78ce51decd7dbb254e38898571da47569b7aeb45ad0e4faa51d63f288c2e63db53a8c111c5a5a2e836a5871258deb92b5f709ceb8ca97642a4277f5827
+  metadata.gz: 47cb62ccb6c9ae3c8fda9c57aa30e9aded8a2c75c28521b39338e5cbd68261975cb46cde52604f669484a6679c128ca93b48ea867472e998a7ea86b7b2d75d67
+  data.tar.gz: 882fae4ab47b161503ed0ea8c7b7feb84bcd58bf02e020d71551f8b487278e245ef07c51a7cc4823ec417092fd171b12a8ff352579706dfb0fb7ca6118d8fa02

data/config/default.md

@@ -23,15 +23,14 @@ queues:
     to: to-janus-admin
 
 janus:
-  cluster:
-    enabled: false
-    count: 0
   session:
     keepalive: 45
   plugins:
     - janus.plugin.echotest
 
 gem:
+  cluster:
+    enabled: true
   log:
     level: info
 ```
@@ -42,7 +41,7 @@ For customizing a configuration add a yml file in your rails project in
 `config/ruby-rabbitmq-janus.yml`, or use rails generator with command `rails generate
 ruby_rabbitmq_janus:configuration`.
 
-## Ressources
+## Resources
 
 * [Configuration of RabbitMQ](https://www.rabbitmq.com/configure.html#config-items)
 * [Configuration of Janus queue](https://janus.conf.meetecho.com/docs/rest.html#rabbit)

data/config/default.yml

@@ -30,12 +30,6 @@ queues:
 
 # Janus plugin used
 janus:
-  # Options for clusturing Janus Instance
-  cluster:
-    # Enable/Disable cluster mode
-    enabled: false
-    # Number to cluster
-    count: 1
   # Option for sessions
   session:
     # Define time to send a keepalive message in seconds
@@ -48,6 +42,13 @@ janus:
 
 # Options gem
 gem:
+  # Options for clusturing Janus Instance
+  cluster:
+    # Enable/Disable cluster mode
+    # if you disable cluster mode, the initializer to this gem start a session
+    # automatically with Janus, but if you enable think to start a session for
+    # each instance
+    enabled: true
   # Option for logs
   log:
     # Define level to log

data/lib/generators/ruby_rabbitmq_janus/templates/migration.rb

@@ -9,6 +9,7 @@ class CreateRubyRabbitmqJanusTables < ActiveRecord::Migration[5.0]
       table.integer :instance
       table.integer :session, limit: 8
       table.boolean :enable
+      table.boolean :thread
     end
   end
 end

data/lib/rrj/errors/error.rb

@@ -7,15 +7,27 @@ module RubyRabbitmqJanus
     #
     # Define errors to gems
     class RRJError < StandardError
-      # Initialize a error standard in this gem
+      # Initialize a error standard in this gem and writing in log file
       #
       # @param [String] message Text returning in raise
       # @param [Symbol] level Important to error
       def initialize(message, level)
         super(message)
-        log = RubyRabbitmqJanus::Tools::Log.instance
-        RubyRabbitmqJanus::Tools::Log.instance_method(level)\
-                                     .bind(log).call(message)
+        write_error(message, level)
+      end
+
+      private
+
+      def log
+        RubyRabbitmqJanus::Tools::Log
+      end
+
+      def logger
+        log.instance
+      end
+
+      def write_error(message, level)
+        log.instance_method(level).bind(logger).call(message)
       end
     end
   end

data/lib/rrj/errors/janus/janus.rb

@@ -17,7 +17,6 @@ module RubyRabbitmqJanus
 end
 
 require 'rrj/errors/janus/processus/concurency'
-require 'rrj/errors/janus/processus/keepalive'
 require 'rrj/errors/janus/processus/event'
 
 require 'rrj/errors/janus/messages/message'

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

@@ -9,25 +9,13 @@ module RubyRabbitmqJanus
       # Define a super class for all error in Janus::Concurency::Keepalive
       class BaseKeepalive < RubyRabbitmqJanus::Errors::Janus::BaseConcurency
         def initialize(message)
-          super "[Keepalive] #{message}"
-        end
-      end
-
-      module Keepalive
-        # Error for Janus::Concurency::Keepalive#initialize
-        class Initializer < RubyRabbitmqJanus::Errors::Janus::BaseKeepalive
-          def initializer
-            super 'Error keepalive initializer'
-          end
-        end
-
-        # Error for Janus::Concurency::Keepalive#session
-        class Session < RubyRabbitmqJanus::Errors::Janus::BaseKeepalive
-          def initializer
-            super 'Error return session number'
-          end
+          super "[Keepalive]#{message}"
         end
       end
     end
   end
 end
+
+require 'rrj/errors/janus/processus/keepalive/initializer'
+require 'rrj/errors/janus/processus/keepalive/thread'
+require 'rrj/errors/janus/processus/keepalive/timer'

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

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+# :reek:IrresponsibleModule
+#
+# rubocop:disable Metrics/LineLength
+# rubocop:disable Style/Documentation
+
+module RubyRabbitmqJanus
+  module Errors
+    module Janus
+      # Define a super class for all error in Janus::Concurency::Keepalive
+      class BaseKeepaliveInitializer < BaseKeepalive
+        def initialize(message)
+          super "[Initializer] #{message}"
+        end
+      end
+
+      module KeepaliveInitializer
+        # Error for Janus::Concurency::Keepalive#initialize
+        class Initializer < RubyRabbitmqJanus::Errors::Janus::BaseKeepaliveInitializer
+          def initializer
+            super 'Error keepalive initializer'
+          end
+        end
+
+        # Error for Janus::Concurency::Keepalive#session
+        class Session < RubyRabbitmqJanus::Errors::Janus::BaseKeepaliveInitializer
+          def initializer
+            super 'Error return session number'
+          end
+        end
+
+        class Thread < RubyRabbitmqJanus::Errors::Janus::BaseKeepaliveInitializer
+          def initializer
+            super 'Error for get Object Thread ID'
+          end
+        end
+
+        class ThreadStart < RubyRabbitmqJanus::Errors::Janus::BaseKeepaliveInitializer
+          def initializer
+            super 'Error for starting timer in thread'
+          end
+        end
+
+        class ThreadStop < RubyRabbitmqJanus::Errors::Janus::BaseKeepaliveInitializer
+          def initializer
+            super 'Error for stoping timer in thread'
+          end
+        end
+
+        class ThreadDelete < RubyRabbitmqJanus::Errors::Janus::BaseKeepaliveInitializer
+          def initializer
+            super 'Error for destroy thread'
+          end
+        end
+      end
+    end
+  end
+end
+# rubocop:enable Style/Documentation
+# rubocop:enable Metrics/LineLength

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+# :reek:IrresponsibleModule
+
+module RubyRabbitmqJanus
+  module Errors
+    module Janus
+      # Define a super class for all error in Janus::Concurency::Keepalive
+      class BaseKeepaliveThread < BaseKeepalive
+        def initialize(message)
+          super "[Thread] #{message}"
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+# :reek:IrresponsibleModule
+
+module RubyRabbitmqJanus
+  module Errors
+    module Janus
+      # Define a super class for all error in Janus::Concurency::Keepalive
+      class BaseKeepaliveTimer < BaseKeepalive
+        def initialize(message)
+          super "[Timer] #{message}"
+        end
+      end
+    end
+  end
+end

data/lib/rrj/errors/rabbit/connect.rb

@@ -13,43 +13,43 @@ module RubyRabbitmqJanus
       module Connect
         # Error for Rabbit::Connect#initialize
         class Initialize < RubyRabbitmqJanus::Errors::Rabbit::BaseConnect
-          def initialize
-            super 'Error in initializer'
+          def initialize(error)
+            super "Error in initializer #{error}"
           end
         end
 
         # Error for Rabbit::Connect#transaction_short
         class TransactionShort < RubyRabbitmqJanus::Errors::Rabbit::BaseConnect
-          def initialize
-            super 'Error during transaction with RabbitMQ'
+          def initialize(error)
+            super "Error during transaction with RabbitMQ #{error}"
           end
         end
 
         # Error for Rabbit::Connect#transaction_long
         class TransactionLong < RubyRabbitmqJanus::Errors::Rabbit::BaseConnect
-          def initialize
-            super 'Error during transaction with RabbitMQ'
+          def initialize(error)
+            super "Error during transaction with RabbitMQ #{error}"
           end
         end
 
         # Error for Rabbit::Connect#start
         class Start < RubyRabbitmqJanus::Errors::Rabbit::BaseConnect
-          def initialize
-            super 'Error for starting connection with RabbitMQ'
+          def initialize(error)
+            super "Error for starting connection with RabbitMQ #{error}"
           end
         end
 
         # Error for Rabbit::Connect#close
         class Close < RubyRabbitmqJanus::Errors::Rabbit::BaseConnect
-          def initialize
-            super 'Error for closing connection with RabbitMQ'
+          def initialize(error)
+            super "Error for closing connection with RabbitMQ #{error}"
           end
         end
 
         # Error for Rabbit::Connect#channel
         class Channel < RubyRabbitmqJanus::Errors::Rabbit::BaseConnect
-          def initialize
-            super 'Error for create channel in RabbitMQ instance'
+          def initialize(error)
+            super "Error for create channel in RabbitMQ instance #{error}"
           end
         end
       end

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

@@ -18,13 +18,6 @@ module RubyRabbitmqJanus
           end
         end
 
-        # Error for Tools::Option#create_sessions
-        class CreateSessions < RubyRabbitmqJanus::Errors::Tools::BaseCluster
-          def initalize
-            super 'Error for creating sessions'
-          end
-        end
-
         # Error for Tools::Option#queue_to
         class QueueTo < RubyRabbitmqJanus::Errors::Tools::BaseCluster
           def initalize
@@ -38,6 +31,13 @@ module RubyRabbitmqJanus
             super 'Error for create string queue_admin_to'
           end
         end
+
+        # Error if restart thread to instance failed
+        class RestartInstance < RubyRabbitmqJanus::Errors::Tools::BaseCluster
+          def initialize(option)
+            super "Error for restart thread to instance #{option}"
+          end
+        end
       end
     end
   end

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

@@ -76,20 +76,6 @@ module RubyRabbitmqJanus
                   "with parameter #{parameter}", :warn
           end
         end
-
-        # Error for Tools::Config#cluster
-        class Cluster < RubyRabbitmqJanus::Errors::Tools::BaseConfig
-          def initialize
-            super 'Error for reading cluster enabled option', :fatal
-          end
-        end
-
-        # Error for Tools::Config#number_of_instance
-        class NumberOfinstance < RubyRabbitmqJanus::Errors::Tools::BaseConfig
-          def initialize
-            super 'Error for reading cluster instance count', :fatal
-          end
-        end
       end
     end
   end

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

@@ -31,6 +31,13 @@ module RubyRabbitmqJanus
             super "Error for test use current handle -- #{opts}", :fatal
           end
         end
+
+        # Error for Tools::Option#cluster_mode
+        class ClusterMode < RubyRabbitmqJanus::Errors::Tools::BaseOption
+          def initialize
+            super 'Error for create session in cluster mode disable', :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.1.1'
+  VERSION = '2.2.0'
 
   # Name to gem
   GEM_NAME = 'ruby_rabbitmq_janus'

data/lib/rrj/init.rb

@@ -39,8 +39,6 @@ module RubyRabbitmqJanus
     #   => #<RubyRabbitmqJanus::RRJ:0x007 @session=123>
     def initialize
       @option = Tools::Option.new
-      ObjectSpace.define_finalizer(self, RRJ.method(:delete).to_proc) \
-        unless File.basename($PROGRAM_NAME).eql?('rspec')
     rescue => error
       raise Errors::RRJ::InstanciateGem, error
     end
@@ -115,14 +113,5 @@ module RubyRabbitmqJanus
     private
 
     attr_reader :option
-
-    def self.delete(_id)
-      Tools::Cluster.instance.sessions.each do |janus_instance|
-        array_ji = "#{janus_instance.instance},#{janus_instance.session}"
-        `rake rrj:delete:one_instance[#{array_ji}]`
-      end
-    end
-
-    private_class_method :delete
   end
 end

data/lib/rrj/janus/processus/concurrency.rb

@@ -13,11 +13,10 @@ module RubyRabbitmqJanus
       class Concurrency
         # Initialize class with elements for thread communication
         def initialize
-          Tools::Log.instance.info "Create an thread -- #{self.class.name}"
-          @rabbit = Rabbit::Connect.new
+          Tools::Log.instance.info info_thread
+          @rabbit = RubyRabbitmqJanus::Rabbit::Connect.new
           @lock = Mutex.new
           @condition = ConditionVariable.new
-          @thread = Thread.new { initialize_thread }
         rescue
           raise Errors::Janus::Concurencies::Initializer
         end
@@ -31,11 +30,15 @@ module RubyRabbitmqJanus
           @rabbit.close
         end
 
-        attr_reader :thread, :lock, :condition, :rabbit
+        def info_thread
+          "Create an thread -- #{self.class.name}"
+        end
+
+        attr_reader :lock, :condition, :rabbit
       end
     end
   end
 end
 
-require 'rrj/janus/processus/keepalive'
+require 'rrj/janus/processus/keepalive/keepalive_initializer'
 require 'rrj/janus/processus/event'

data/lib/rrj/janus/processus/event.rb

@@ -5,7 +5,7 @@ module RubyRabbitmqJanus
     module Concurrencies
       # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
 
-      # # Listen standar queue
+      # # Listen public queue to all Janus instance
       #
       # Listen standard queue and sending a block code to thread listen.
       # The default queue is configured in config file.
@@ -14,8 +14,9 @@ module RubyRabbitmqJanus
       class Event < Concurrency
         include Singleton
 
-        def initalize
+        def initialize
           super
+          @thread = Thread.new { initialize_thread }
         rescue
           raise Errors::Janus::Event::Initializer
         end
@@ -28,9 +29,11 @@ module RubyRabbitmqJanus
         #
         # @return [Thread] It's a thread who listen queue and execute action
         def run(&block)
-          thread.join
+          @thread.join
           Thread.new do
-            loop { thread.thread_variable_get(:publish).listen_events(&block) }
+            loop do
+              @thread.thread_variable_get(:publish).listen_events(&block)
+            end
           end
         rescue
           raise Errors::Janus::Event::Run
@@ -40,7 +43,7 @@ module RubyRabbitmqJanus
 
         def transaction_running
           publisher = Rabbit::Publisher::Listener.new(rabbit)
-          Thread.current.thread_variable_set(:publish, publisher)
+          @thread.thread_variable_set(:publish, publisher)
         end
       end
     end