ruby_rabbitmq_janus 2.6.0.pre.247 → 2.6.0.pre.258

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0403e680765b24268400bab862938a771432959961a9071a87a7491f1880eb00
-  data.tar.gz: 222fcf4697c1aeef809dd131c3d6dfe922aa6cf0357c132097e691958b4b9b6e
+  metadata.gz: 7c2c4198c70eb700d253b4ff3f8177d170c0dfb7739596d28996080d128152d4
+  data.tar.gz: 6865ae1fc691f3cb88ebe03a59401b8193bf43754b9fc61230564ced574033d3
 SHA512:
-  metadata.gz: f4c5c93c62f7028515dcc21fe0b5f30bd5b977e997692d4b76a20524705902e8f56964a43a3e6e46d30c56e71e6793034dbe595bf429974b172229044305f84f
-  data.tar.gz: 8c7f474b45d0ed4958625ccc3056bd7efdc9c3ca457c469e453198f1ce89da5947f35b749337dfb2e9cea5a690d8d45fbbf9b45fb5a1c617e9989bdd0cf57817
+  metadata.gz: e4dd95300f9b59baed2319cd4b4048c51909308e50d0c345287a9f986b7c96d29b3d70535fbe3545c42c6236f4aa7782c6523059f7aae5add543a345a8a09641
+  data.tar.gz: 107548935cfdf99305aa34af5c941ee6996b51773ef9e2f3d8ee9cc9e62ba8390c2a8a5d3cb266c3f4040aeb7f09de5c6b06372d238d59d23d163f3898c5e947

data/bin/ruby_rabbitmq_janus

@@ -12,8 +12,12 @@
 # Use `Log` variable in ActionEvents class
 # for writing in another logger instead rails logs.
 
-require 'rrj/tools/bin/environment'
-require 'rrj/tools/bin/arguments'
 require 'rrj/tools/bin/config'
+require 'rrj/tools/gem/log'
+
+Log = RubyRabbitmqJanus::Tools::Logger.create
+RubyRabbitmqJanus::Tools::Logger.start
+
 require 'rrj/tools/bin/model'
+require 'ruby_rabbitmq_janus'
 require 'rrj/tools/bin/init'

data/config/default.md

@@ -35,8 +35,13 @@ gem:
     enabled: true
   log:
     level: info
+    type: file
+    option: ''
   listener:
     path: 'app/ruby_rabbitmq_janus'
+  environment: 'development'
+  orm: 'mongoid'
+  program_name: 'ruby_rabbitmq_janus'
 ```
 
 ## Customize

data/config/default.yml

@@ -58,7 +58,26 @@ gem:
     # Define level to log
     # UNKNOW, FATAL, ERROR, WARN, INFO, DEBUG
     level: debug
+    # Precise type logger
+    # stdout    : Output standard.
+    # file      : Create log file in path 'log/ruby-rabbitmq-janus.log'.
+    # rails     : Use logger rails.
+    # remote    : Use RemoteSyslogLogger (for papertrail)
+    type: file
+    # Used with type. Complete missing data :
+    # stdout    : no option
+    # file      : filename used
+    # rails     : no option
+    # remote    : data output (logs.papertrail.com:4685@program_rrj:backend_host)
+    option: ''
   # Options for listener thread
   listener:
     # Represent path to action_events class in project who use this gem
     path: 'app/ruby_rabbitmq_janus'
+  # Environment to application
+  environment : 'development'
+  # Precise ORM used :
+  # mongoid or active_record
+  orm: 'mongoid'
+  # Define program name
+  program_name: 'ruby_rabbitmq_janus'

data/lib/rrj/binary.rb

@@ -1,13 +1,9 @@
 # frozen_string_literal: true
 
-action_event_path = "#{Dir.pwd}/#{LISTENER_PATH}"
-Log.debug "Load action events to path : #{action_event_path}"
-require action_event_path
-require 'rrj/tools/gem/config'
 require 'rrj/models/concerns/janus_instance_callbacks'
 require 'rrj/models/concerns/janus_instance_methods'
 require 'rrj/models/concerns/janus_instance_validations'
-require "rrj/models/#{defined?(Mongoid) ? 'mongoid' : 'active_record'}"
+require "rrj/models/#{RubyRabbitmqJanus::Tools::Config.instance.orm}"
 
 module RubyRabbitmqJanus
   # :reek:InstanceVariableAssumption
@@ -22,8 +18,6 @@ module RubyRabbitmqJanus
   # if enable become true a new session with janus is created
   class Binary
     def initialize
-      RubyRabbitmqJanus::Tools::Config.instance
-
       start_instances
     end
 

data/lib/rrj/errors/error.rb

@@ -18,16 +18,12 @@ module RubyRabbitmqJanus
 
       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)
+        if defined?(::Log)
+          ::Log.add(level, message)
+        else
+          p "#{level}, #{message}"
+        end
       end
     end
   end

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

@@ -85,6 +85,36 @@ module RubyRabbitmqJanus
             super "[Cluster] Cluster parameter is missing, with parameter #{parameter}", :warn
           end
         end
+
+        class LogType < RubyRabbitmqJanus::Errors::Tools::BaseConfig
+          def initialize
+            super '[LogType] Error with Log Type', :fatal
+          end
+        end
+
+        class LogOption < RubyRabbitmqJanus::Errors::Tools::BaseConfig
+          def initialize
+            super '[LogOption] Error with Log Option', :fatal
+          end
+        end
+
+        class Environment < RubyRabbitmqJanus::Errors::Tools::BaseConfig
+          def initialize
+            super '[Environment] Error with environment option', :fatal
+          end
+        end
+
+        class ORM < RubyRabbitmqJanus::Errors::Tools::BaseConfig
+          def initialize
+            super '[ORM] Error with Object Relational Mapping option', :fatal
+          end
+        end
+
+        class ProgramName < RubyRabbitmqJanus::Errors::Tools::BaseConfig
+          def initialize
+            super '[ProgramName] Error with ProgramName option', :fatal
+          end
+        end
       end
     end
   end

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

@@ -14,7 +14,6 @@ module RubyRabbitmqJanus
 end
 
 require 'rrj/errors/tools/gem/cluster'
-require 'rrj/errors/tools/gem/config'
 require 'rrj/errors/tools/gem/log'
 require 'rrj/errors/tools/gem/option'
 require 'rrj/errors/tools/gem/request'

data/lib/rrj/init.rb

@@ -9,6 +9,11 @@ require 'logger'
 require 'key_path'
 require 'active_support'
 require 'erb'
+require 'rrj/tools/bin/config'
+require 'rrj/tools/gem/log'
+
+Log = RubyRabbitmqJanus::Tools::Logger.create unless defined?(Log)
+RubyRabbitmqJanus::Tools::Logger.start
 
 # :reek:TooManyStatements
 

data/lib/rrj/janus/messages/message.rb

@@ -93,11 +93,11 @@ module RubyRabbitmqJanus
 
         def load_request_file
           @request = request_instance
-          Tools::Log.instance.debug "Opening request : #{to_json}"
+          ::Log.debug "Opening request : #{to_json}"
         end
 
         def prepare_request(_options)
-          Tools::Log.instance.debug "Prepare request for janus : #{to_json}"
+          ::Log.debug "Prepare request for janus : #{to_json}"
         end
 
         def request_instance

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

@@ -13,7 +13,7 @@ module RubyRabbitmqJanus
       class Concurrency
         # Initialize class with elements for thread communication
         def initialize
-          Tools::Log.instance.info info_thread
+          ::Log.info info_thread
           @rabbit = RubyRabbitmqJanus::Rabbit::Connect.new
           @lock = Mutex.new
           @condition = ConditionVariable.new
@@ -26,7 +26,7 @@ module RubyRabbitmqJanus
         def initialize_thread
           @rabbit.transaction_long { transaction_running }
         rescue Interrupt
-          Tools::Log.instance.info "Stop transaction #{self.class.name}"
+          ::Log.info "Stop transaction #{self.class.name}"
           @rabbit.close
         end
 

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

@@ -6,6 +6,7 @@
 # :reek:TooManyInstanceVariables
 # :reek:TooManyStatements
 # :reek:UncommunicativeVariableName
+# :reek:TooManyMethods
 
 module RubyRabbitmqJanus
   module Janus
@@ -23,7 +24,7 @@ module RubyRabbitmqJanus
           @timer = KeepaliveTimer.new
           @message = KeepaliveMessage.new(instance)
           instance.set(thread: __id__)
-          Tools::Log.instance.info "Keepalive thread id is #{__id__}"
+          ::Log.info "Keepalive thread id is #{__id__}"
           super(&block)
         rescue
           raise Errors::Janus::KeepaliveThread::Initializer
@@ -41,13 +42,13 @@ module RubyRabbitmqJanus
         # Restart session
         # :reek:TooManyStatements
         def restart_session
-          Tools::Log.instance.warn 'Restart session ...'
+          ::Log.warn 'Restart session ...'
           janus = find_model
           if janus.present?
             send_messages_restart
             janus.set(session: @session)
           else
-            Tools::Log.instance.error 'Janus Instance Model is gone, giving up'
+            ::Log.error 'Janus Instance Model is gone, giving up'
           end
         rescue
           raise Errors::Janus::KeepaliveThread::RestartSession
@@ -59,16 +60,16 @@ module RubyRabbitmqJanus
         def start
           @timer.loop_keepalive do
             if detached?(find_model)
-              Tools::Log.instance.info \
+              ::Log.info \
                 "Thread #{__id__} no longer attached to Janus Instance, " \
                 'exiting...'
               @timer.stop_timer
               cleanup
               exit
             else
-              Tools::Log.instance.info "Thread #{__id__} " \
-                'sending keepalive to instance ' \
-                "#{@message.instance} with TTL #{@timer.time_to_live}"
+              ::Log.info msg_send_ttl(__id__,
+                                      @message.instance,
+                                      @timer.time_to_live)
               response_keepalive
             end
           end
@@ -90,12 +91,12 @@ module RubyRabbitmqJanus
           janus = find_model
           @session = @message = nil
           if detached?(janus)
-            Tools::Log.instance.error\
+            ::Log.error\
               "Thread [#{__id__}] no longer attached to Janus Instance " \
               '(should be dead).'
           else
             janus.set(enable: false).unset(%I[thread session])
-            Tools::Log.instance.fatal \
+            ::Log.fatal \
               "Janus Instance [#{janus.instance}] is down, " \
               "thread [#{__id__}] will die."
           end
@@ -121,13 +122,13 @@ module RubyRabbitmqJanus
           if @message.present?
             Models::JanusInstance.find(@message.instance)
           else
-            Tools::Log.instance.warn \
+            ::Log.warn \
               "Lookup Janus Instance model by session [#{@session}]"
             Models::JanusInstance.find_by_session(@session)
           end
         rescue StandardError => exception
-          Tools::Log.debug exception
-          Tools::Log.instance.warn \
+          ::Log.debug exception
+          ::Log.warn \
             "find_model: rescuing from error #{e.message}"
           nil
         end
@@ -158,6 +159,10 @@ module RubyRabbitmqJanus
         def publish(message)
           @publisher.publish(message)
         end
+
+        def msg_send_ttl(id, inst, ttl)
+          "Thread #{id} sending keepalive to instance #{inst} with TTL #{ttl}"
+        end
       end
     end
   end

data/lib/rrj/janus/transactions/handle.rb

@@ -56,7 +56,7 @@ module RubyRabbitmqJanus
         # Send a message detach
         def detach
           options = opts.merge('instance' => @instance)
-          Tools::Log.instance.debug "Detach handle #{options}"
+          ::Log.debug "Detach handle #{options}"
           publisher.publish(Janus::Messages::Standard.new('base::detach',
                                                           options))
         rescue

data/lib/rrj/janus/transactions/transaction.rb

@@ -30,18 +30,18 @@ module RubyRabbitmqJanus
         def choose_queue
           chan = @rabbit.channel
           @publisher = if @exclusive
-                         Tools::Log.instance.debug \
+                         ::Log.debug \
                            'Choose an queue Exclusive : ampq.gen-xxx'
                          Rabbit::Publisher::Exclusive.new(chan, '')
                        else
-                         Tools::Log.instance.debug \
+                         ::Log.debug \
                            'Choose an queue non Exclusive : to-janus'
                          Rabbit::Publisher::NonExclusive.new(chan)
                        end
         end
 
         def send_a_message
-          Tools::Log.instance.info 'Publish a message ...'
+          ::Log.info 'Publish a message ...'
           response = read_response(@publisher.publish(yield))
           Janus::Responses::Standard.new(response)
         end

data/lib/rrj/models/concerns/janus_instance_callbacks.rb

@@ -9,14 +9,14 @@ module RubyRabbitmqJanus
 
       # Create a session in Janus Instance
       def callback_create_after
-        Tools::Log.instance.debug 'Callback AFTER_VALIDATION'
+        ::Log.debug 'Callback AFTER_VALIDATION'
         create_a_session_in_janus_instance if enable
       end
 
       # Update a keepalive transaction in Janus Instance
       # Enable or Disable transaction
       def callback_update_after
-        Tools::Log.instance.debug 'Callback AFTER_UPDATE'
+        ::Log.debug 'Callback AFTER_UPDATE'
         if enable && enable_changed?
           create_a_session_in_janus_instance
         elsif !enable && enable_changed?
@@ -27,7 +27,7 @@ module RubyRabbitmqJanus
       # Destroy a session in Janus Instance
       # :reek:UtilityFunction
       def callback_destroy_after
-        Tools::Log.instance.debug 'Callback AFTER_DESTROY'
+        ::Log.debug 'Callback AFTER_DESTROY'
         # LCO: nothing to do, thread will close session and die
       end
 
@@ -54,7 +54,7 @@ module RubyRabbitmqJanus
       end
 
       def info_instance(text)
-        Tools::Log.instance.debug "#{text} in Janus Instance [##{instance}]"
+        ::Log.debug "#{text} in Janus Instance [##{instance}]"
       end
 
       def message

data/lib/rrj/rabbit/connect.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-# :reek:TooManyStatements
-# :reek:FeatureEnvy
-# :reek:RepeatedConditional
-
 module RubyRabbitmqJanus
   module Rabbit
     # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
@@ -12,23 +8,14 @@ module RubyRabbitmqJanus
     class Connect
       # Initialize connection to server RabbitMQ
       def initialize
-        @rabbit = if Tools::Config.instance.tester?
-                    require 'bunny-mock'
-                    BunnyMock.new.start
-                  else
-                    Bunny.new(read_options_server.merge!(option_log_rabbit))
-                  end
+        @rabbit = Bunny.new(Tools::Config.instance.server_settings)
       rescue => exception
         raise Errors::Rabbit::Connect::Initialize, exception
       end
 
       # Create an transaction with rabbitmq and close after response is received
       def transaction_short
-        response = if Tools::Config.instance.tester?
-                     fake_transaction
-                   else
-                     transaction_long { yield }
-                   end
+        response = transaction_long { yield }
         close
         response
       rescue => exception
@@ -38,11 +25,7 @@ module RubyRabbitmqJanus
       # Create an transaction with rabbitmq and not close
       def transaction_long
         start
-        if Tools::Config.instance.tester?
-          @rabbit.channel.queue.pop[:message]
-        else
-          yield
-        end
+        yield
       rescue => exception
         raise Errors::Rabbit::Connect::TransactionLong, exception
       end
@@ -63,37 +46,10 @@ module RubyRabbitmqJanus
 
       # Create an channel
       def channel
-        if Tools::Config.instance.tester?
-          @rabbit.channel
-        else
-          @rabbit.create_channel
-        end
+        @rabbit.create_channel
       rescue => exception
         raise Errors::Rabbit::Connect::Channel, exception
       end
-
-      private
-
-      def fake_transaction
-        channel = @rabbit.channel
-        queue = channel.queue 'janus-queue-test'
-        queue.publish 'RSpec testing message'
-        queue.pop
-      end
-
-      def read_options_server
-        conn = %w[host port pass user vhost]
-        cfg = Tools::Config.instance.options['rabbit']
-        Hash[conn.map { |value| [value.to_sym, cfg[value]] }]
-      end
-
-      def option_log_rabbit
-        lvl = Tools::Config.instance.log_level_rabbit.upcase.to_sym
-        {
-          log_level: Tools::Log::LEVELS[lvl],
-          log_file: Tools::Log.instance.logdev
-        }
-      end
     end
   end
 end

data/lib/rrj/rabbit/connect_fake.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+require 'bunny-mock'
+
+# :reek:FeatureEnvy
+
+module RubyRabbitmqJanus
+  module Rabbit
+    # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
+    #
+    # Override class connect with a Faker connection with rabbitmq
+    class ConnectFake
+      # Initialize connection to server RabbitMQ
+      def initialize
+        @rabbit = BunnyMock.new.start
+      rescue => exception
+        raise Errors::Rabbit::Connect::Initialize, exception
+      end
+
+      # Create an transaction with rabbitmq and close after response is received
+      def transaction_short
+        response = fake_transaction
+        close
+        response
+      rescue => exception
+        raise Errors::Rabbit::Connect::TransactionShort, exception
+      end
+
+      # Create an transaction with rabbitmq and not close
+      def transaction_long
+        start
+        @rabbit.channel.queue.pop[:message]
+      rescue => exception
+        raise Errors::Rabbit::Connect::TransactionLong, exception
+      end
+
+      # Opening a connection with RabbitMQ
+      def start
+        @rabbit.start
+      rescue => exception
+        raise Errors::Rabbit::Connect::Start, exception
+      end
+
+      # Close connection to server RabbitMQ
+      def close
+        @rabbit.close
+      rescue => exception
+        raise Errors::Rabbit::Connect::Close, exception
+      end
+
+      # Create an channel
+      def channel
+        @rabbit.channel
+      rescue => exception
+        raise Errors::Rabbit::Connect::Channel, exception
+      end
+
+      private
+
+      def fake_transaction
+        channel = @rabbit.channel
+        queue = channel.queue 'janus-queue-test'
+        queue.publish 'RSpec testing message'
+        queue.pop
+      end
+    end
+  end
+end

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

@@ -46,14 +46,14 @@ 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}"
+          ::Log.info "[X] Message reading with ID #{message_id}"
         end
 
         def info_subscribe(info, prop, payload)
-          Tools::Log.instance.debug info
-          Tools::Log.instance.info \
+          ::Log.debug info
+          ::Log.info \
             "[X] Message reading ##{prop['correlation_id']}"
-          Tools::Log.instance.debug payload
+          ::Log.debug payload
         end
       end
     end

data/lib/rrj/rabbit/propertie.rb

@@ -13,7 +13,7 @@ module RubyRabbitmqJanus
 
       # Initialize a message sending to rabbitmq
       def initialize(instance = 1)
-        Tools::Log.instance.debug 'initalize a propertie to message'
+        ::Log.debug 'initalize a propertie to message'
         @correlation = SecureRandom.uuid
         @instance = instance
       rescue

data/lib/rrj/rabbit/rabbit.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require 'rrj/rabbit/connect'
+require 'rrj/rabbit/connect_fake' \
+  if RubyRabbitmqJanus::Tools::Config.instance.tester?
 require 'rrj/rabbit/base_event'
 require 'rrj/rabbit/propertie'
 

data/lib/rrj/rails.rb

@@ -13,8 +13,8 @@ module RubyRabbitmqJanus
   class Rails < ::Rails::Engine
     config.after_initialize do
       Log.debug '[RRJ] After initializer'
-      Log.debug "Load file : #{File.join(Dir.pwd, LISTENER_PATH)}"
-      require File.join(Dir.pwd, LISTENER_PATH)
+      require File.join(Dir.pwd,
+                        RubyRabbitmqJanus::Tools::Config.instance.listener_path)
 
       Log.info 'Listen public queue in thread'
       actions = RubyRabbitmqJanus::ActionEvents.new.actions

data/lib/rrj/task.rb

@@ -12,7 +12,6 @@ module RubyRabbitmqJanus
   # This class is used with rake task.
   class RRJTask < RRJ
     def initialize
-      Tools::Log.instance
       Tools::Config.instance
       Tools::Requests.instance
     rescue

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-# Load gem config if present
+# Load gem Config if present
+# @see https://rubygems.org/gems/config
 
 begin
   require 'config'
@@ -8,7 +9,7 @@ begin
   if defined?(Config)
     config_conf = [
       File.join(Dir.pwd, 'config', 'settings.yml'),
-      File.join(Dir.pwd, 'config', 'settings', "#{ENVIRONMENT}.yml")
+      File.join(Dir.pwd, 'config', 'settings', "#{ENV['RAILS_ENV']}.yml")
     ]
     Config.load_and_set_settings(config_conf)
   end

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

@@ -3,39 +3,12 @@
 # Loads files RRJ and write first message in log,
 # then initialize binary
 
-require 'rrj/info'
-require 'ruby_rabbitmq_janus'
-
-# rubocop:disable Naming/ConstantName
-::Log = if @logger_default
-          RubyRabbitmqJanus::Tools::Log.instance
-        else
-          require_relative @logger_path
-          @logger_class.constantize.instance
-        end
-# rubocop:enable Naming/ConstantName
-
-Log.info "RRJ Version : #{RubyRabbitmqJanus::VERSION}"
-Log.info "\r\n#{RubyRabbitmqJanus::BANNER}"
-
+p "Has rails engine ?? #{defined?(Rails)} -- #{defined?(::Rails::Engine)}"
+require 'rrj/rails' # defined?(::Rails::Engine)
 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

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

@@ -2,6 +2,11 @@
 
 # Select ORM between Mongoid and ActiveRecord
 
-require ORM
-Mongoid.load!(File.join(Dir.pwd, 'config', 'mongoid.yml'), ENVIRONMENT) \
-  if defined?(Mongoid)
+require 'rrj/errors/error'
+require RubyRabbitmqJanus::Tools::Config.instance.orm
+
+# For mongoid gem
+if RubyRabbitmqJanus::Tools::Config.instance.orm.eql?('mongoid')
+  Mongoid.load!(File.join(Dir.pwd, 'config', 'mongoid.yml'),
+                RubyRabbitmqJanus::Tools::Config.instance.env.to_sym)
+end