ruby_rabbitmq_janus 2.6.0.pre.227 → 2.6.0.pre.228

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eca46c9840cbe7758f93fa8748a4c603dc43dc8db2212ab67a840e97bd3af1f2
-  data.tar.gz: 3dc04f38427ef4b1e585ccce703ebd2018b1fba570d22498d66720f1448ff548
+  metadata.gz: d017c973ed1d038fa82e439709d55676959c39f8d5da0baba11db424871b56ec
+  data.tar.gz: 1130ee0bec609d84e3756fceabb59f7b04de788e28eb831c83f6a0efcc7f6d73
 SHA512:
-  metadata.gz: c5227e29fbb2d193194182998ac2cbf8988c61a2286108c2d241e2b4057da526c936d20a5d4816c16dfec0b275ce142a665ba1798f4ad0d645560ffda8fc6860
-  data.tar.gz: 8459d98ede3e7ca8392ef56c3545da0c7c4af6ef979cec3f272626dbeedf90e9a7cd7692a17c80550f6180b575d4b33244d51370adda7c71dfea25d645ae0b82
+  metadata.gz: 251050b3b72daf634d10b22559f7b1e54efe53938490a6f4d58069777cc501f0b9648fd4753a4b7e217569bfb9197879b7817e848be6b79fc2b7f30ec7d8c102
+  data.tar.gz: 8006626826a1dc238f61551284c8cc9657ee86041f761a4e6bedcaf9f6c827f71567a480ab2afaadd7211c18f0e0cb2f3d9dd33514a63a12f8b0498fb94bfbc8

data/bin/ruby_rabbitmq_janus

@@ -7,62 +7,13 @@
 # a queue in RabbitMQ and enable (or disable) JanusInstance model in database.
 #
 # @author VAILLANT Jeremy <jeremy@dazzl.tv>
+# @since 2.6.0
 #
 # Use `Log` variable in ActionEvents class
 # for writing in another logger instead rails logs.
 
-ENVIRONMENT = ENV['RAILS_ENV']
-ORM = ENV['ORM']
-LISTENER_PATH = ENV['LISTENER_PATH']
-PROGRAM = ENV['PROGRAM_NAME']
-
-begin
-  require 'config'
-
-  if defined?(Config)
-    config_conf = [
-      File.join(Dir.pwd, 'config', 'settings.yml'),
-      File.join(Dir.pwd, 'config', 'settings', "#{ENVIRONMENT}.yml")
-    ]
-    Config.load_and_set_settings(config_conf)
-  end
-rescue LoadError => exception
-  p 'Don\'t use gem config'
-  p exception
-end
-
-# Select ORM between Mongoid and ActiveRecord
-require ORM
-Mongoid.load!(File.join(Dir.pwd, 'config', 'mongoid.yml'), ENVIRONMENT) \
-  if defined?(Mongoid)
-require 'rrj/info'
-require 'ruby_rabbitmq_janus'
-
-::Log = RubyRabbitmqJanus::Tools::Log.instance
-
-Log.info "RRJ Version : #{RubyRabbitmqJanus::VERSION}"
-Log.info RubyRabbitmqJanus::BANNER
-
-require File.join(File.dirname(__FILE__), '..', 'lib', 'rrj', 'binary')
-
-begin
-  bin = RubyRabbitmqJanus::Binary.new
-  Log.info \
-    'Prepare to listen events in queue : ' + \
-    RubyRabbitmqJanus::Tools::Config.instance.queue_janus_instance
-  rabbit = RubyRabbitmqJanus::Rabbit::Connect.new
-  rabbit.start
-  listener = RubyRabbitmqJanus::Rabbit::Listener::JanusInstance.new(rabbit)
-  Log.info 'Loop events provided by Janus queues'
-  loop do
-    listener.listen_events do |event, response|
-      Log.debug "Event : #{event}"
-      Log.debug "Response : #{response.to_hash}"
-      bin.update_instance(response.to_hash)
-    end
-  end
-rescue => exception
-  Log.fatal '!! Fail to start RRJ threads !!'
-  Log.fatal exception
-  exit 1
-end
+require 'rrj/tools/bin/environment'
+require 'rrj/tools/bin/arguments'
+require 'rrj/tools/bin/config'
+require 'rrj/tools/bin/model'
+require 'rrj/tools/bin/init'

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

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+# Arguments
+#
+# --verbose
+# --log <path>
+
+def arg_log(path, class_name)
+  @logger_default = false
+  @logger_class = class_name
+  @logger_path = "#{Dir.pwd}/#{path}"
+end
+
+def arg_verbose
+  @verbose = true
+end
+
+ARGV.each_with_index do |argument, position|
+  case argument
+  when '--log'
+    arg_log(ARGV[position + 1],
+            ARGV[position + 2])
+  when --'verbose'
+    arg_verbose
+  else
+    next
+  end
+end

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

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+# Load gem config if present
+
+begin
+  require 'config'
+
+  if defined?(Config)
+    config_conf = [
+      File.join(Dir.pwd, 'config', 'settings.yml'),
+      File.join(Dir.pwd, 'config', 'settings', "#{ENVIRONMENT}.yml")
+    ]
+    Config.load_and_set_settings(config_conf)
+  end
+rescue LoadError => exception
+  p 'Don\'t use gem config'
+  p exception
+end

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

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+# Load environment variables for execute correctly `Binary` class
+
+ENVIRONMENT = ENV['RAILS_ENV']
+ORM = ENV['ORM']
+LISTENER_PATH = ENV['LISTENER_PATH']
+PROGRAM = ENV['PROGRAM_NAME']
+
+@verbose = false
+@logger_class = true

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

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+# Loads files RRJ and write first message in log,
+# then initialize binary
+
+require 'rrj/info'
+require 'ruby_rabbitmq_janus'
+
+::Log = if @logger_default
+          RubyRabbitmqJanus::Tools::Log.instance
+        else
+          require_relative @logger_path
+          @logger_class.constantize.instance
+        end
+
+Log.info "RRJ Version : #{RubyRabbitmqJanus::VERSION}"
+Log.info RubyRabbitmqJanus::BANNER
+
+require File.join(File.dirname(__FILE__), '..', '..', 'binary')
+
+begin
+  bin = RubyRabbitmqJanus::Binary.new
+  Log.info \
+    'Prepare to listen events in queue : ' + \
+    RubyRabbitmqJanus::Tools::Config.instance.queue_janus_instance
+  rabbit = RubyRabbitmqJanus::Rabbit::Connect.new
+  rabbit.start
+  listener = RubyRabbitmqJanus::Rabbit::Listener::JanusInstance.new(rabbit)
+  Log.info 'Loop events provided by Janus queues'
+  loop do
+    listener.listen_events do |event, response|
+      Log.debug "Event : #{event}"
+      Log.debug "Response : #{response.to_hash}"
+      bin.update_instance(response.to_hash)
+    end
+  end
+rescue => exception
+  Log.fatal '!! Fail to start RRJ threads !!'
+  Log.fatal exception
+  exit 1
+end

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

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+# Select ORM between Mongoid and ActiveRecord
+
+require ORM
+Mongoid.load!(File.join(Dir.pwd, 'config', 'mongoid.yml'), ENVIRONMENT) \
+  if defined?(Mongoid)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_rabbitmq_janus
 version: !ruby/object:Gem::Version
-  version: 2.6.0.pre.227
+  version: 2.6.0.pre.228
 platform: ruby
 authors:
 - VAILLANT Jeremy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-29 00:00:00.000000000 Z
+date: 2019-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -538,6 +538,11 @@ files:
 - lib/rrj/railtie.rb
 - lib/rrj/task.rb
 - lib/rrj/task_admin.rb
+- lib/rrj/tools/bin/arguments.rb
+- lib/rrj/tools/bin/config.rb
+- lib/rrj/tools/bin/environment.rb
+- lib/rrj/tools/bin/init.rb
+- lib/rrj/tools/bin/model.rb
 - lib/rrj/tools/gem/cluster.rb
 - lib/rrj/tools/gem/config.rb
 - lib/rrj/tools/gem/log.rb