ruby_rabbitmq_janus 2.1.0.pre.132 → 2.1.0.pre.135

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da7e01aeca98c6e18831e2cf501e64dc610b475d
-  data.tar.gz: c4360ad19e7e7b6c4d8f889a1d129a4e6054d075
+  metadata.gz: c188ceac4ac4583890417754fd3e2c26fcdb234e
+  data.tar.gz: 9d7c46b66b1a3df6af9ff38057182c570a29e0e4
 SHA512:
-  metadata.gz: bf48a1a06651cfd5ffbe2efe96ce432ffdaf2a08c45dd41f90f415d20fab6ec74219d7df6cdf0634b51171665c0ecfb753d8f8dca014672e6072c7e08d80e3b7
-  data.tar.gz: aabb11904efe47062cfe789ade7ef8f2cf332f48be8cf69cea9785213d4d14315e3622d518aded39be036bf175628d4ea967b2b69c3ed75ebf6a6334652625ad
+  metadata.gz: e029d096e54440d38d4b5a4da95adae672d2ffdd515aecdcfd18c5ee79e408bb898dbff38f8d44360ae38f2eddeb6ba13adb982f67cd684a28faa0d8581fdf3c
+  data.tar.gz: ced541b0b09c60aa4175c1d6936f934b8ad8708d6709321227ae2a1f5cc775d65fa4daa522ada37727064faaed98d11aac2ab5d15adf32dfa2925f41b8766346

data/config/default.md

@@ -12,6 +12,7 @@ rabbit:
     user: guest
     pass: guest
     admin_pass: janusoverlord
+    level: :info
 
 queues:
   standard:

data/config/default.yml

@@ -10,8 +10,10 @@ rabbit:
   user: guest
   # Precise RabbitMQ password - Default 'guest'
   pass: guest
-    # Password for admin request
+  # Password for admin request
   admin_pass: janusoverlord
+  # Logger level for rabbitmq message
+  level: info
 
 # RabbitMQ Queue information
 queues:

data/config/requests.md

@@ -21,6 +21,7 @@ By default this gem contains many request :
 │   ├── answer.json
 │   ├── offer.json
 │   ├── trickle.json
+│   ├── trickles.json
 ```
 
 * Folder `admin` contains admin requests for interact with Janus Admin/Monitor

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

@@ -55,6 +55,13 @@ module RubyRabbitmqJanus
           end
         end
 
+        # Error for Tools::Config#log_level
+        class LevelRabbitMissing < RubyRabbitmqJanus::Errors::Tools::BaseConfig
+          def initialize
+            super 'Error for reading option level for rabbitmq', :warn
+          end
+        end
+
         # Error for Tools::Config#time_to_live (or #ttl)
         class TTLNotFound < RubyRabbitmqJanus::Errors::Tools::BaseConfig
           def initialize

data/lib/rrj/init.rb

@@ -39,7 +39,9 @@ module RubyRabbitmqJanus
     #   => #<RubyRabbitmqJanus::RRJ:0x007 @session=123>
     def initialize
       @option = Tools::Option.new
-      ObjectSpace.define_finalizer(self, RRJ.method(:delete).to_proc)
+      puts "Base Program : #{$PROGRAM_NAME}"
+      ObjectSpace.define_finalizer(self, RRJ.method(:delete).to_proc) \
+        unless File.basename($PROGRAM_NAME).eql?('rspec')
     rescue => error
       raise Errors::RRJ::InstanciateGem, error
     end

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

@@ -72,12 +72,9 @@ module RubyRabbitmqJanus
         private
 
         def create_handle
-          Tools::Log.instance.info 'Create an handle'
           opt = { 'session_id' => session, 'instance' => @instance }
           msg = Janus::Messages::Standard.new('base::attach', opt)
-          Tools::Log.instance.info "Send message attach -- #{@handle}"
           @handle = send_a_message_exclusive { msg }
-          Tools::Log.instance.info "Message attach is sending -- #{@handle}"
         end
 
         def send_a_message_exclusive

data/lib/rrj/rabbit/connect.rb

@@ -63,14 +63,10 @@ module RubyRabbitmqJanus
       end
 
       def option_log_rabbit
-        if Tools::Log.instance.level.zero?
-          {
-            log_level: Tools::Log.instance.level,
-            log_file: Tools::Log.instance.logdev
-          }
-        else
-          {}
-        end
+        {
+          log_level: Tools::Config.instance.log_level_rabbit,
+          log_file: Tools::Log.instance.logdev
+        }
       end
     end
   end

data/lib/rrj/task.rb

@@ -40,12 +40,21 @@ module RubyRabbitmqJanus
     #
     # @since 2.1.0
     def start_transaction_handle(exclusive = true, options = {})
-      session = Models::JanusInstance.find_by(options['instance']).session
+      janus = session_instance(options)
       handle = 0 # Create always a new handle
-      transaction = Janus::Transactions::Handle.new(exclusive, session, handle)
+      transaction = Janus::Transactions::Handle.new(exclusive,
+                                                    janus.session,
+                                                    handle,
+                                                    janus.instance)
       transaction.connect { yield(transaction) }
     rescue
       raise Errors::RRJTask::StartTransactionHandle, exclusive, options
     end
+
+    private
+
+    def session_instance(options)
+      Models::JanusInstance.find_by_instance(options['instance'])
+    end
   end
 end

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

@@ -77,7 +77,13 @@ module RubyRabbitmqJanus
 
       # @return [Symbol] read configuration for log level used in this gem
       def log_level
-        @options['gem']['log']['level'].upcase.to_sym
+        @options['gem']['log']['level'].upcase.to_sym || :INFO
+      rescue
+        raise Errors::Tools::Config::LevelNotDefine
+      end
+
+      def log_level_rabbit
+        @options['rabbit']['level'].upcase.to_sym || :INFO
       rescue
         raise Errors::Tools::Config::LevelNotDefine
       end

data/lib/tasks/delete_all_instance.rake

@@ -4,11 +4,14 @@ namespace :rrj do
   namespace :delete do
     desc 'Delete all instances in database and janus'
     task all_instances: :environment do
+      tags = '[RubyRabbitmqJanus][rrj:delete:all_instances] '
       timelaps = Time.now.utc
 
+      Rails.logger.info "#{tags}Delete all instances"
+
       RubyRabbitmqJanus::Models::JanusInstance.destroy_all
 
-      Rails.logger.info "Executed in #{Time.now.utc - timelaps} ms"
+      Rails.logger.info "#{tags}Executed in #{Time.now.utc - timelaps} ms"
     end
   end
 end

data/lib/tasks/delete_one_instance.rake

@@ -4,17 +4,18 @@ namespace :rrj do
   namespace :delete do
     desc 'Delete one instance in database and janus'
     task :one_instance, [:instance, :session] => :environment do |_task, args|
+      tags = '[RubyRabbitmqJanus][rrj:delete:one_instance] '
       timelaps = Time.now.utc
 
-      Rails.logger.info \
-        "Delete instance #{args[:instance]} with session #{args[:session]}"
+      Rails.logger.info "#{tags}Delete instance #{args[:instance]} " \
+                        "with session #{args[:session]}"
 
       janus_instance = RubyRabbitmqJanus::Models::JanusInstance\
         .find_by_session(args[:session])
 
       janus_instance.destroy if janus_instance
 
-      Rails.logger.info "Executed in #{Time.now.utc - timelaps} ms"
+      Rails.logger.info  "#{tags}Executed in #{Time.now.utc - timelaps} ms"
     end
   end
 end

data/lib/tasks/delete_unless_instance.rake

@@ -4,11 +4,14 @@ namespace :rrj do
   namespace :delete do
     desc 'Delete all instances disable in database and janus'
     task unless_instance: :environment do
+      tags = '[RubyRabbitmqJanus][rrj:delete:unless_instance] '
       timelaps = Time.now.utc
 
+      Rails.logger.info "#{tags}Delete unless instance(s)"
+
       RubyRabbitmqJanus::Models::JanusInstance.find_by(enable: false).delete_all
 
-      Rails.logger.info "Executed in #{Time.now.utc - timelaps} ms"
+      Rails.logger.info "#{tags}Executed in #{Time.now.utc - timelaps} ms"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_rabbitmq_janus
 version: !ruby/object:Gem::Version
-  version: 2.1.0.pre.132
+  version: 2.1.0.pre.135
 platform: ruby
 authors:
 - VAILLANT Jeremy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-09 00:00:00.000000000 Z
+date: 2017-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler