arsenicum 0.3.1.2 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14f630cddca6963437610dc104f8f5f04d8da3c5
-  data.tar.gz: c02744a60e0007ef9322d586407976b0432da431
+  metadata.gz: 9c515f579e66429e8c6c45cbc3f9dcd215b26d39
+  data.tar.gz: 23f075c1c83004cf9272b7cd8949da16c18ba169
 SHA512:
-  metadata.gz: de77d585a2475cf9c47f8e28b32b2217188370298329d3db7fd91ab0fb577fd1cdc74e2f5defaf8cfc375f6db6e9513fa4d4eb05c4765135c870c595c0f8fc87
-  data.tar.gz: 3175e85b544f41deaf1c10924bc39e4606bde5fde11fd8ea039b6bd9958be551f56539dad4a7ce4f8d26a638e4e461a2479a391f356372c5c3494c926680ae81
+  metadata.gz: 609a092cb19169ab3f09589812b7454bcd32f8ac379ce99d4fad2c8eab01dccabbfc65176ea38785212d7f14e7c4a8ecc52fc8a053cfcec2a4d77e424c7c686e
+  data.tar.gz: 9cb39dbf8341c7973ab53c2659c58c344025b7f8c338c290fc8cf68fc7914b5c6a751c504e60d9a5127944c51614dfc218728dc0ce31f19c9db09f3c308c6a85

data/lib/arsenicum/configuration.rb

@@ -118,7 +118,7 @@ module Arsenicum
       end
 
       def build
-        klass.new(name, init_parameters.merge(router_class: router_class)).tap do |queue|
+        klass.new(name, init_parameters.merge(worker_count: worker_count, router_class: router_class)).tap do |queue|
           task_configurations.each do |task_config|
             queue.register task_config.build
           end

data/lib/arsenicum/core/broker.rb

@@ -11,7 +11,6 @@ class Arsenicum::Core::Broker
 
   def initialize(options = {})
     @worker_count = (options.delete(:worker_count) || PROCESSOR_COUNT_DEFAULT).to_i
-    @mutex = Mutex.new
     @tasks = {}
     @router = options.delete :router
 
@@ -19,6 +18,8 @@ class Arsenicum::Core::Broker
     formatter  = options[:formatter]   ||  Arsenicum::Formatter.new
     @worker_options = options.delete(:worker_options) || {}
     @worker_options.merge! serializer: serializer,  formatter: formatter
+    @current_worker_index = -1 # because it is incremented whenever used. (primary index should be ZERO)
+    @mutex = Mutex.new
   end
 
   def [](task_id)
@@ -32,8 +33,8 @@ class Arsenicum::Core::Broker
   alias_method :register, :[]=
 
   def run
-    @workers = {}
-    @available_workers = {}
+    @workers = []
+    @available_workers = []
 
     prepare_workers
   end
@@ -56,63 +57,56 @@ class Arsenicum::Core::Broker
   end
 
   def stop
-    workers.values.map(&:stop)
+    workers.each(&:stop)
   end
 
   def remove(worker)
-    mutex.synchronize do
-      workers.delete(worker.pid)
-      available_workers.delete(worker.pid)
-    end
+    available_workers.delete(worker)
+    workers.delete(worker)
   end
 
   def reload
-    workers.values.each(&:stop)
+    stop
 
-    workers.clear
     available_workers.clear
+    workers.clear
 
     prepare_workers
   end
 
   def get_back_worker(worker)
-    mutex.synchronize{
-      if worker.active?
-        available_workers[worker.pid] = worker
-      else
-        next_index = workers.count
-        remove worker
-        worker.stop
-        prepare_worker next_index
-      end
-    }
+    if worker.active?
+      available_workers << worker
+    else
+      remove worker
+      worker.stop
+      prepare_worker
+    end
   end
 
   private
   def prepare_workers
-    @worker_count.times do |i|
-      prepare_worker i
-    end
+    @worker_count.times{prepare_worker}
   end
 
-  def prepare_worker index
-    worker = Arsenicum::Core::Worker.new(self, index, worker_options)
+  def prepare_worker
+    worker = Arsenicum::Core::Worker.new(self, next_worker_index, worker_options)
     stock(worker)
   end
 
+  def next_worker_index
+    mutex.synchronize{
+      @current_worker_index += 1
+    }
+  end
+
   def stock(worker)
-    mutex.synchronize do
-      pid = worker.run
-      workers[pid] = worker
-      available_workers[pid] = worker
-    end
+    workers << worker
+    available_workers << worker
   end
 
   def next_worker
-    mutex.synchronize do
-      (_, worker) = available_workers.shift
-      worker
-    end
+    mutex.synchronize{available_workers.shift}
   end
 
   def serialize(value = {})

data/lib/arsenicum/core/worker.rb

@@ -27,28 +27,14 @@ class Arsenicum::Core::Worker
     @thread     = InvokerThread.new(self)
     @work_at    = :parent
     @state      = :parent
-  end
-
-  def run
-    (@in_parent, @out_child)            = open_binary_pipes
-    (@in_child, @out_parent)            = open_binary_pipes
-    (@ctrl_in_parent, @ctrl_out_child)  = open_binary_pipes
-    (@ctrl_in_child,  @ctrl_out_parent) = open_binary_pipes
-
-    @pid = fork &method(:run_in_child)
-    return unless @pid
 
-    @active = true
-    [in_child, out_child, ctrl_in_child, ctrl_out_child].each(&:close)
-    pid
+    run
   end
 
-  def open_binary_pipes
-    IO.pipe.each do |io|
-      io.set_encoding 'BINARY'
-    end.tap do |pipes|
-      pipes.last.sync = true
-    end
+  def ==(another)
+    return false unless another.is_a? ::Arsenicum::Core::Worker
+
+    return another.pid == self.pid
   end
 
   def ask(task_id, *parameters)
@@ -70,13 +56,51 @@ class Arsenicum::Core::Worker
 
   def stop
     thread.terminate
-    return if Process.waitpid pid, Process::WNOHANG
+    return unless child_process_alive?
 
     write_message   ctrl_out_parent, COMMAND_STOP
     Process.waitpid pid
   end
 
+  def active?
+    worker_thread_alive? && child_process_alive?
+  end
+
+  def return_to_broker
+    broker.get_back_worker self
+  end
+
   private
+  def worker_thread_alive?
+    thread.alive?
+  end
+
+  def child_process_alive?
+    Process.waitpid pid, Process::WNOHANG
+  end
+
+  def run
+    (@in_parent, @out_child)            = open_binary_pipes
+    (@in_child, @out_parent)            = open_binary_pipes
+    (@ctrl_in_parent, @ctrl_out_child)  = open_binary_pipes
+    (@ctrl_in_child,  @ctrl_out_parent) = open_binary_pipes
+
+    @pid = fork &method(:run_in_child)
+    return unless @pid
+
+    @active = true
+    [in_child, out_child, ctrl_in_child, ctrl_out_child].each(&:close)
+    pid
+  end
+
+  def open_binary_pipes
+    IO.pipe.each do |io|
+      io.set_encoding 'BINARY'
+    end.tap do |pipes|
+      pipes.last.sync = true
+    end
+  end
+
   def run_in_child
     switch_state  :waiting
     [in_parent, out_parent, ctrl_in_parent, ctrl_out_parent].each(&:close)
@@ -96,13 +120,6 @@ class Arsenicum::Core::Worker
     end
   end
 
-  def active?
-    case state
-      when :waiting, :busy
-        true
-    end
-  end
-
   def switch_state(state)
     @state  = state
     $0      = process_name
@@ -180,10 +197,6 @@ class Arsenicum::Core::Worker
     "arsenicum[Worker ##{index}] - #{state}"
   end
 
-  def return_to_broker
-    broker.get_back_worker self
-  end
-
   [:debug,  :info,  :warn,  :error, :fatal].each do |level|
     eval <<-SCRIPT, binding, __FILE__, __LINE__ + 1
     def #{level}(message: nil, exception: nil)
@@ -238,7 +251,7 @@ class Arsenicum::Core::Worker
             failure_handler.call e
           ensure
             self.task_request = nil
-            return_to_broker
+            worker.return_to_broker
           end
         end
       end

data/lib/arsenicum/logger.rb

@@ -4,8 +4,8 @@ module Arsenicum::Logger
   class << self
     attr_reader :logger
 
-    def configure(logger_config)
-      @logger = logger_config.build
+    def set_logger(logger)
+      @logger = logger
     end
 
     [:debug, :info, :warn, :error, :fatal].each do |method|

data/lib/arsenicum/main.rb

@@ -47,7 +47,7 @@ module Arsenicum
     def before_boot(config);end
 
     def configure_log(config)
-      Arsenicum::Logger.configure config.logger_config
+      Arsenicum::Logger.set_logger config.logger_config.build
     end
 
     def trap_signal

data/lib/arsenicum/queue.rb

@@ -25,8 +25,12 @@ class Arsenicum::Queue
         next
       end
 
-      next sleep(0.5) unless message
+      unless message
+        sleep(0.5)
+        next
+      end
 
+      Arsenicum::Logger.info{"Queue picked. message: #{message.inspect}"}
       broker.delegate message, -> { handle_success(original_message) }, -> e { handle_failure(e, original_message) }
     end
   end

data/lib/arsenicum/version.rb

@@ -1,3 +1,3 @@
 module Arsenicum
-  VERSION = '0.3.1.2'
+  VERSION = '0.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arsenicum
 version: !ruby/object:Gem::Version
-  version: 0.3.1.2
+  version: '0.4'
 platform: ruby
 authors:
 - condor