ruby_rabbitmq_janus 3.0.0.pre.352 → 3.0.0.pre.354

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9410fdf3db086fdaf0c7abd7c822612977718f0d2059869ec0bfd5522e30dacf
-  data.tar.gz: dfe4addba32bc68b336cb4db8177a791589cde45ed73d78799fc7d298ef129a0
+  metadata.gz: c734f054b82c7313cc2f700856897005589fc8cd85083b21562ee2574ad038eb
+  data.tar.gz: 617e6caa75c5cad2280d07c6056161a25ed549d825fb9524ae6cc3c098132085
 SHA512:
-  metadata.gz: 99ea49a811322ecc33e84b2f7fc03bc181b9b515520debbceaf922b59fc0007073ae571f4fb1e9004052c04596606efabacbfdda8a7157bbf411d8ca8f1b7900
-  data.tar.gz: 2ca3d7bc242cb865bc397f21d43be8504af0b2e40cb9c77907f4120867a2b10adc8fa9ada6d3b5714b9f4c33d41d871d1bc12cb9a92010731a9dbd47909b0c2b
+  metadata.gz: 9ec5a373c987a2bf9c18d2ea1b1478a6a4814967af89d73cdc7a04cd0cd79922d8f9e7ad6d5d4da555e64f1f23c13598da1ba403d7f84741da424154e92ff22a
+  data.tar.gz: 74ab344770f32f388f0fcb009dd90e82388b74b1dd8732903ef6c658a0b714b084f7595bee353419510ef08f65f2fc41499e09a2a12c1ef6f050802bf2d28918

data/lib/rrj/process/concurrency.rb

@@ -22,22 +22,24 @@ module RubyRabbitmqJanus
 
         private
 
+        attr_reader :lock, :condition, :rabbit
+
         def initialize_thread
           @rabbit.transaction_long { transaction_running }
         rescue Interrupt
-          ::Log.info "Stop transaction #{self.class.name}"
+          ::Log.warn \
+            "Close a connection with RabbitMQ instance for #{self.class.name}"
           @rabbit.close
         end
 
         def info_thread
           "Create an thread -- #{self.class.name}"
         end
-
-        attr_reader :lock, :condition, :rabbit
       end
     end
   end
 end
 
+require 'rrj/process/thread_runner_concern'
 require 'rrj/process/event'
 require 'rrj/process/event_admin'

data/lib/rrj/process/event.rb

@@ -12,41 +12,21 @@ module RubyRabbitmqJanus
       #
       # @see file:/config/default.md For more information to config file used.
       class Event < Concurrency
-        NAME_VAR = :publish
+        include RubyRabbitmqJanus::Process::Concurrencies::ThreadRunnerConcern
 
-        def initialize
-          super
-          @thread = Thread.new { initialize_thread }
-        end
-
-        # Create a thread for execute a block code in a thread
-        #
-        # @param [Proc] block Block code for execute action when queue
-        #   standard 'from-janus' receive a message.This block is sending to
-        #   publisher created for this thread.
-        #
-        # @return [Thread] It's a thread who listen queue and execute action
-        def run(&block)
-          raise RubyRabbitmqJanus::Errors::Process::Event::Run \
-            unless block_given?
+        private
 
-          @thread.join
-          Thread.new do
-            loop do
-              @thread.thread_variable_get(NAME_VAR).listen_events(&block)
-            end
-          end
+        def raise_nil_block
+          raise RubyRabbitmqJanus::Errors::Process::Event::Run
         end
 
-        private
+        def name_publisher
+          :publish
+        end
 
         def publisher
           Rabbit::Listener::From.new(rabbit)
         end
-
-        def transaction_running
-          @thread.thread_variable_set(NAME_VAR, publisher)
-        end
       end
     end
   end

data/lib/rrj/process/event_admin.rb

@@ -12,41 +12,21 @@ module RubyRabbitmqJanus
       #
       # @see file:/config/default.md For more information to config file used.
       class EventAdmin < Concurrency
-        NAME_VAR = :publish_adm
+        include RubyRabbitmqJanus::Process::Concurrencies::ThreadRunnerConcern
 
-        def initialize
-          super
-          @thread = Thread.new { initialize_thread }
-        end
-
-        # Create a thread for execute a block code in a thread
-        #
-        # @param [Proc] block Block code for execute action when queue
-        #   standard 'from-janus' receive a message.This block is sending to
-        #   publisher created for this thread.
-        #
-        # @return [Thread] It's a thread who listen queue and execute action
-        def run(&block)
-          raise RubyRabbitmqJanus::Errors::Process::EventAdmin::Run \
-            unless block_given?
+        private
 
-          @thread.join
-          Thread.new do
-            loop do
-              @thread.thread_variable_get(NAME_VAR).listen_events(&block)
-            end
-          end
+        def raise_nil_block
+          raise RubyRabbitmqJanus::Errors::Process::EventAdmin::Run
         end
 
-        private
+        def name_publisher
+          :publish_adm
+        end
 
         def publisher
           Rabbit::Listener::FromAdmin.new(rabbit)
         end
-
-        def transaction_running
-          @thread.thread_variable_set(NAME_VAR, publisher)
-        end
       end
     end
   end

data/lib/rrj/process/thread_runner_concern.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require 'active_support/concern'
+
+module RubyRabbitmqJanus
+  module Process
+    module Concurrencies
+      # Module injected in Concurrencies classes.
+      #
+      # Manage threads for public/admin queue to rabbitmq.
+      #
+      # :reek:ModuleInitialize
+      module ThreadRunnerConcern
+        extend ActiveSupport::Concern
+
+        # Initialize an process (event/event_admin) and configure
+        # the life cycle to thread.
+        def initialize
+          super
+          @thread = Thread.new { initialize_thread }
+          @thread.abort_on_exception = true
+        end
+
+        # Create a thread for execute a block code in a thread.
+        # This code is outside to `RRJ` gem so is very important
+        # to be sure this code execution is not fail.
+        #
+        # @param [Proc] block Block code for execute action when queue
+        #   standard 'from-janus' receive a message.This block is sending to
+        #   publisher created for this thread.
+        #
+        # @return [Thread] It's a thread who listen queue and execute action
+        def run(&block)
+          raise_nil_block unless block_given?
+
+          @thread.join
+          Thread.new do
+            loop do
+              @thread.thread_variable_get(name_publisher).listen_events(&block)
+            rescue => exception
+              ::Log.warn 'An exception to was encountered in the thread !'
+              ::Log.warn exception
+            end
+          end
+        end
+
+        private
+
+        def transaction_running
+          @thread.thread_variable_set(name_publisher, publisher)
+        end
+      end
+    end
+  end
+end

data/spec/support/examples_thread.rb

@@ -6,8 +6,8 @@ shared_examples 'when thread' do
   let(:action) { EventTest.new.actions }
   let(:size) { (rand * 10).to_i }
 
-  it { expect(concurrency::NAME_VAR).to be_a(Symbol) }
-  it { expect(concurrency::NAME_VAR).to eql(publish_name) }
+  it { expect(event.send(:name_publisher)).to be_a(Symbol) }
+  it { expect(event.send(:name_publisher)).to eql(publish_name) }
   it { expect(action).not_to be(nil) }
   it { expect { event.run(&action) }.not_to raise_error(exception_runner) }
   it { expect { event.run }.to raise_error(exception_runner) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_rabbitmq_janus
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.352
+  version: 3.0.0.pre.354
 platform: ruby
 authors:
 - VAILLANT Jeremy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-19 00:00:00.000000000 Z
+date: 2019-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -513,6 +513,7 @@ files:
 - lib/rrj/process/concurrency.rb
 - lib/rrj/process/event.rb
 - lib/rrj/process/event_admin.rb
+- lib/rrj/process/thread_runner_concern.rb
 - lib/rrj/rabbit/base_event.rb
 - lib/rrj/rabbit/connect.rb
 - lib/rrj/rabbit/listener/base.rb