ruby_rabbitmq_janus 2.1.1 → 2.2.0.pre.42

data/lib/rrj/models/mongoid.rb

@@ -7,13 +7,18 @@ module RubyRabbitmqJanus
     # Store instance information for MongoID database
     class JanusInstance
       include Mongoid::Document
-      include RubyRabbitmqJanus::Models::JanusInstanceConcern
+      include RubyRabbitmqJanus::Models::JanusInstanceCallbacks
+      include RubyRabbitmqJanus::Models::JanusInstanceMethods
+      include RubyRabbitmqJanus::Models::JanusInstanceValidations
 
       field :instance, type: Integer
       field :session, type: Integer
       field :enable, type: Boolean
+      field :thread, type: Integer
 
-      set_callback(:destroy, :before) { destroy_before_action }
+      set_callback(:create,     :after)   { callback_create_after }
+      set_callback(:update,     :after)   { callback_update_after }
+      set_callback(:destroy,    :after)   { callback_destroy_after }
     end
   end
 end

data/lib/rrj/rabbit/connect.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# :reek:TooManyStatements
+
 module RubyRabbitmqJanus
   module Rabbit
     # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
@@ -9,8 +11,8 @@ module RubyRabbitmqJanus
       # Initialize connection to server RabbitMQ
       def initialize
         @rabbit = Bunny.new(read_options_server.merge!(option_log_rabbit))
-      rescue
-        raise Errors::Rabbit::Connect::Initialize
+      rescue => error
+        raise Errors::Rabbit::Connect::Initialize, error
       end
 
       # Create an transaction with rabbitmq and close after response is received
@@ -18,37 +20,37 @@ module RubyRabbitmqJanus
         response = transaction_long { yield }
         close
         response
-      rescue
-        raise Errors::Rabbit::Connect::TransactionShort
+      rescue => error
+        raise Errors::Rabbit::Connect::TransactionShort, error
       end
 
       # Create an transaction with rabbitmq and not close
       def transaction_long
         start
         yield
-      rescue
-        raise Errors::Rabbit::Connect::TransactionLong
+      rescue => error
+        raise Errors::Rabbit::Connect::TransactionLong, error
       end
 
       # Openning a connection with Rabbitmq
       def start
         @rabbit.start
-      rescue
-        raise Errors::Rabbit::Start
+      rescue => error
+        raise Errors::Rabbit::Connect::Start, error
       end
 
       # Close connection to server RabbitMQ
       def close
         @rabbit.close
-      rescue
-        raise Errors::Rabbit::Close
+      rescue => error
+        raise Errors::Rabbit::Connect::Close, error
       end
 
       # Create an channel
       def channel
         @rabbit.create_channel
-      rescue
-        raise Errors::Rabbit::Channel
+      rescue => error
+        raise Errors::Rabbit::Connect::Channel, error
       end
 
       private

data/lib/rrj/rabbit/publish/keepalive.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module RubyRabbitmqJanus
+  module Rabbit
+    module Publisher
+      # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
+      #
+      # # Publish message for keepalive thread
+      #
+      # The name to queue it's created automatically by Bunny GEM
+      #
+      # @see KeepaliveThread
+      class PublishKeepalive < Publisher
+        def initialize(exchange)
+          @reply = exchange.queue('', exclusive: true)
+          super(exchange)
+          subscribe_to_queue
+        end
+
+        def publish(request)
+          super(request)
+          return_response
+        rescue
+          raise Errors::Rabbit::PublishExclusive::Publish
+        end
+
+        private
+
+        attr_reader :reply
+      end
+    end
+  end
+end

data/lib/rrj/rabbit/publish/publisher.rb

@@ -70,4 +70,5 @@ end
 
 require 'rrj/rabbit/publish/admin'
 require 'rrj/rabbit/publish/exclusive'
+require 'rrj/rabbit/publish/keepalive'
 require 'rrj/rabbit/publish/non_exclusive'

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

@@ -8,27 +8,31 @@ module RubyRabbitmqJanus
     class Cluster
       include Singleton
 
-      attr_reader :number, :enable, :sessions
+      attr_reader :sessions
 
-      # Initalize object for managing each instance to Janus
+      # Initialize object for managing each instance to Janus
       def initialize
         @current_instance = nil
-        config = Config.instance
-        @enable = config.cluster
-        @number = config.number_of_instance
         @sessions = []
       rescue
         raise Errors::Tools::Cluster::Initializer
       end
 
-      # Create all session. One by instance
-      def create_sessions
-        (1..@number).each do |janus_instance|
-          @current_instance = janus_instance
-          @sessions.push create_session_instance
+      # Create session (just one Janus Instance)
+      def create_session
+        @current_instance = 1
+        Models::JanusInstance.create(instance: @current_instance)
+      rescue
+        raise Errors::Tools::Cluster::CreateSession
+      end
+
+      # Restart a thread keepalive for an instance
+      def restart_session
+        Models::JanusInstance.enabled.each do |ji|
+          ji.send(:create_a_session_in_janus_instance)
         end
       rescue
-        raise Errors::Tools::Cluster::CreateSessions
+        raise Errors::Tools::Cluster::RestartInstance
       end
 
       # Specify a name to queue
@@ -46,20 +50,6 @@ module RubyRabbitmqJanus
       rescue
         raise Errors::Tools::Cluster::QueueAdminTo
       end
-
-      private
-
-      # Create a thread for manage a session/keepalive with Janus
-      def initialize_session
-        Janus::Concurrencies::Keepalive.new(@current_instance).session
-      end
-
-      # create a new instance in database
-      def create_session_instance
-        Models::JanusInstance.create(instance: @current_instance,
-                                     session: initialize_session,
-                                     enable: true)
-      end
     end
   end
 end

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

@@ -109,18 +109,11 @@ module RubyRabbitmqJanus
 
       # @return [Boolean] Read option file for a janus cluster section
       def cluster
-        @options['janus']['cluster']['enabled'].to_s.eql?('true') ? true : false
+        @options['gem']['cluster']['enabled'].to_s.match?('true') ? true : false
       rescue
         raise Errors::Tools::Config::Cluster
       end
 
-      # Count number of Janus instances
-      def number_of_instance
-        @options['janus']['cluster']['count'].to_i || 1
-      rescue
-        raise Errors::Tools::Config::NumberOfInstance
-      end
-
       private
 
       def load_configuration

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

@@ -1,11 +1,9 @@
 # frozen_string_literal: true
 
-require 'rrj/models/concerns/janus_instance_concern'
-if defined?(Mongoid)
-  require 'rrj/models/mongoid'
-else
-  require 'rrj/models/active_record'
-end
+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'}"
 
 # :reek:FeatureEnvy
 
@@ -15,14 +13,14 @@ module RubyRabbitmqJanus
 
     # # Utility for manage option to this gem.
     #
-    # This class start all singleton, Log, Config, Request and Keepalice
-    # instance. It's alos used for testing session/handle used in request.
+    # This class start all singleton, Log, Config, Request and Keepalive
+    # instance. It's also used for testing session/handle used in request.
     class Option
       def initialize
         Log.instance
         Config.instance
         Requests.instance
-        Cluster.instance.create_sessions
+        cluster_mode
       rescue => error
         raise Errors::Tools::Option::Initialize, error
       end
@@ -56,6 +54,15 @@ module RubyRabbitmqJanus
       rescue
         raise Errors::Tools::Option::UseCurrentHandle, options
       end
+
+      private
+
+      def cluster_mode
+        method = Config.instance.cluster ? :restart_session : :create_session
+        Cluster.instance.send(method)
+      rescue
+        raise Errors::Tools::Option::ClusterMode
+      end
     end
   end
 end

data/spec/rrj/tools/gem/rrj_cluster_spec.rb

@@ -3,10 +3,6 @@
 require 'spec_helper'
 
 describe RubyRabbitmqJanus::Tools::Cluster, type: :tools, name: :cluster do
-  it { expect(RubyRabbitmqJanus::Tools::Cluster.instance.enable).to eql(false) }
-
-  it { expect(RubyRabbitmqJanus::Tools::Cluster.instance.number).to eql(1) }
-
   it do
     expect(RubyRabbitmqJanus::Tools::Cluster.instance.queue_to(42)).to \
       eql('to-janus-42')
@@ -19,8 +15,8 @@ describe RubyRabbitmqJanus::Tools::Cluster, type: :tools, name: :cluster do
 
   context 'when created sessions with active record' do
     it do
-      expect(RubyRabbitmqJanus::Tools::Cluster.instance.create_sessions).to \
-        be_a(Range)
+      expect(RubyRabbitmqJanus::Tools::Cluster.instance.create_session).to \
+        be_a(Integer)
     end
   end
 end

data/spec/rrj/tools/gem/rrj_config_spec.rb

@@ -41,16 +41,11 @@ describe RubyRabbitmqJanus::Tools::Config, type: :tools, name: :config do
     it_behaves_like 'type and default value', String, ''
   end
 
-  context 'janus/cluster/enabled' do
+  context 'gem/cluster/enabled' do
     let(:method) { @cfg.cluster }
     it_behaves_like 'type and default value', FalseClass, false
   end
 
-  context 'janus/cluster/count' do
-    let(:method) { @cfg.number_of_instance }
-    it_behaves_like 'type and default value', Integer, 1
-  end
-
   context 'queues/standard/from' do
     let(:method) { @cfg.queue_from }
     it_behaves_like 'type and default value', String, 'from-janus'

data/spec/support/schemas/config/config.json

@@ -55,13 +55,11 @@
       "type": "hash",
       "properties": {
         "plugins": { "type": "hash" },
-        "session": { "type": "hash" },
-        "cluster": { "type": "hash" }
+        "session": { "type": "hash" }
       },
       "required": [
         "session",
-        "plugins",
-        "cluster"
+        "plugins"
       ]
     },
     "gem": {
@@ -75,10 +73,20 @@
           "required": [
             "level"
           ]
+        },
+        "cluster": {
+          "type": "hash",
+          "properties": {
+            "enabled": { "type": "boolean" }
+          },
+          "required": [
+            "enabled"
+          ]
         }
       },
       "required": [
-        "log"
+        "log",
+        "cluster"
       ]
     }
   },

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_rabbitmq_janus
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0.pre.42
 platform: ruby
 authors:
 - VAILLANT Jeremy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-14 00:00:00.000000000 Z
+date: 2017-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -318,6 +318,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.1
+- !ruby/object:Gem::Dependency
+  name: timers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
 description: |2
     This gem is used to communicate to a server Janus through RabbitMQ software
     (Message-oriented middleware). It waiting a messages to Rails API who send to
@@ -378,6 +392,9 @@ files:
 - lib/rrj/errors/janus/processus/concurency.rb
 - lib/rrj/errors/janus/processus/event.rb
 - lib/rrj/errors/janus/processus/keepalive.rb
+- lib/rrj/errors/janus/processus/keepalive/initializer.rb
+- lib/rrj/errors/janus/processus/keepalive/thread.rb
+- lib/rrj/errors/janus/processus/keepalive/timer.rb
 - lib/rrj/errors/janus/responses/admin.rb
 - lib/rrj/errors/janus/responses/event.rb
 - lib/rrj/errors/janus/responses/response.rb
@@ -411,7 +428,10 @@ files:
 - lib/rrj/janus/messages/standard.rb
 - lib/rrj/janus/processus/concurrency.rb
 - lib/rrj/janus/processus/event.rb
-- lib/rrj/janus/processus/keepalive.rb
+- lib/rrj/janus/processus/keepalive/keepalive_initializer.rb
+- lib/rrj/janus/processus/keepalive/keepalive_message.rb
+- lib/rrj/janus/processus/keepalive/keepalive_thread.rb
+- lib/rrj/janus/processus/keepalive/keepalive_timer.rb
 - lib/rrj/janus/responses/admin.rb
 - lib/rrj/janus/responses/event.rb
 - lib/rrj/janus/responses/response.rb
@@ -421,13 +441,16 @@ files:
 - lib/rrj/janus/transactions/session.rb
 - lib/rrj/janus/transactions/transaction.rb
 - lib/rrj/models/active_record.rb
-- lib/rrj/models/concerns/janus_instance_concern.rb
+- lib/rrj/models/concerns/janus_instance_callbacks.rb
+- lib/rrj/models/concerns/janus_instance_methods.rb
+- lib/rrj/models/concerns/janus_instance_validations.rb
 - lib/rrj/models/mongoid.rb
 - lib/rrj/rabbit/connect.rb
 - lib/rrj/rabbit/propertie.rb
 - lib/rrj/rabbit/publish/admin.rb
 - lib/rrj/rabbit/publish/base_publisher.rb
 - lib/rrj/rabbit/publish/exclusive.rb
+- lib/rrj/rabbit/publish/keepalive.rb
 - lib/rrj/rabbit/publish/listener.rb
 - lib/rrj/rabbit/publish/non_exclusive.rb
 - lib/rrj/rabbit/publish/publisher.rb
@@ -549,12 +572,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Ruby RabbitMQ Janus

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

@@ -1,79 +0,0 @@
-# frozen_string_literal: true
-
-module RubyRabbitmqJanus
-  module Janus
-    module Concurrencies
-      # @author VAILLANT Jeremy <jeremy.vaillant@dazzl.tv>
-      #
-      # # Manage keepalive message
-      #
-      # Create a thread for sending a message with type keepalive to session
-      # created by this instanciate gem
-      #
-      # @see https://ruby-doc.org/stdlib-2.4.0/libdoc/singleton/rdoc/Singleton.html
-      class Keepalive < Concurrency
-        # Initialize a singleton object for sending keepalive to janus
-        def initialize(instance)
-          @pub = @session = nil
-          @instance = instance
-          super()
-        rescue
-          raise Errors::Janus::Keepalive::Initializer
-        end
-
-        # Give a session Integer created when this gem is intanciate.
-        # Is waiting a thread return a response to message created sending.
-        #
-        # @example Ask session
-        #   Keepalive.session
-        #   => 852803383803249
-        #
-        # @return [Fixnum] Identifier to session created by Janus
-        def session
-          lock.synchronize do
-            condition.wait(lock)
-            @session
-          end
-        rescue
-          raise Errors::Janus::Keepalive::Session
-        end
-
-        private
-
-        def transaction_running
-          @session = find_session
-          lock.synchronize { condition.signal }
-          loop { loop_session(Tools::Config.instance.ttl) }
-        end
-
-        def loop_session(time_to_live)
-          sleep time_to_live
-          @pub.publish(message_keepalive)
-          Tools::Log.instance.info "Keepalive for #{@session}"
-        end
-
-        def create_session
-          @pub = Rabbit::Publisher::PublishExclusive.new(rabbit.channel, '')
-          msg = Janus::Messages::Standard.new('base::create', param_instance)
-          @pub.publish(msg)
-        end
-
-        def message_keepalive
-          Janus::Messages::Standard.new('base::keepalive', param_session)
-        end
-
-        def find_session
-          Janus::Responses::Standard.new(create_session).session
-        end
-
-        def param_instance
-          { 'instance' => @instance }
-        end
-
-        def param_session
-          { 'session_id' => @session }.merge(param_instance)
-        end
-      end
-    end
-  end
-end