arsenicum 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ab173d20a8fbeb50f1d4099843803ba7cf2dffa
-  data.tar.gz: beca6681e379afdff0b8937ecf3f26b13da31809
+  metadata.gz: 9d49ec4dfbcc45d77e58afdf36d28bee1d06eb68
+  data.tar.gz: 291a2344942b30df1fcc03d274cbb49e76a48560
 SHA512:
-  metadata.gz: 7f0420449f7150749113320efacc675c391adbe38b08a309c7ff7565a87e09428f59836b986394a60f559b97eb393a79a49c260aadeb1cbf73f4716b00012d55
-  data.tar.gz: 90c22916d4cb7ce98f5483e9873c8b84496df082c397ba541e56e42de233d9756ca205007c9390ad7d873d66e3ce157d05ca42b1508613c66842c4bb53c7138a
+  metadata.gz: 7f29b77fae0f8c344c64916a44d27d0e02f94a818723d09efda39a8069894344389a9b27b71dd21ff38fc36c093999c6a8fb9b89bee9f82f1d5b25b72e2e5726
+  data.tar.gz: 3193c124fb5c4c090252a233ea8f7428731155d682f1baa7828ce57ae813c92dbf1bf865dec4aca1e23921134df1dbe07c817242e61ba577a41ed07ff3b7fbdc

data/lib/arsenicum/core/broker.rb

@@ -72,18 +72,27 @@ class Arsenicum::Core::Broker
   end
 
   def get_back_worker(worker)
-    mutex.synchronize{available_workers[worker.pid] = 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
+    }
   end
 
   private
   def prepare_workers
-    @worker_count.times do
-      prepare_worker
+    @worker_count.times do |i|
+      prepare_worker i
     end
   end
 
-  def prepare_worker
-    worker = Arsenicum::Core::Worker.new(self, worker_options)
+  def prepare_worker index
+    worker = Arsenicum::Core::Worker.new(self, index, worker_options)
     stock(worker)
   end
 
@@ -105,4 +114,4 @@ class Arsenicum::Core::Broker
   def serialize(value = {})
     serializer.serialize value
   end
-end
+end

data/lib/arsenicum/core/worker.rb

@@ -5,11 +5,12 @@ class Arsenicum::Core::Worker
   include Arsenicum::Core::IOHelper
 
   attr_reader :pid, :in_parent, :out_parent, :thread,
-              :in_child,  :out_child, :active, :broker, :serializer,  :formatter
+              :in_child,  :out_child, :active, :broker, :serializer,  :formatter, :index
   alias_method :active?, :active
 
-  def initialize(broker, worker_configuration)
+  def initialize(broker, index, worker_configuration)
     @broker     = WeakRef.new broker # avoiding circular references.
+    @index      = index
     @serializer = worker_configuration[:serializer]
     @formatter  = worker_configuration[:formatter]
     @thread     = InvokerThread.new(self)
@@ -20,6 +21,7 @@ class Arsenicum::Core::Worker
     (@in_child, @out_parent) = open_binary_pipes
 
     @pid = fork do
+      $0 = "arsenicum[worker][#{index}]"
       [in_parent, out_parent].each(&:close)
 
       begin

data/lib/arsenicum/main.rb

@@ -1,6 +1,8 @@
 module Arsenicum
   module Main
     def run(config_file)
+      $0 = 'arsenicum[main]'
+
       config = Arsenicum::Configuration.new
       config_file = File.expand_path config_file
 
@@ -8,7 +10,7 @@ module Arsenicum
       config.instance_eval script, config_file, 1
 
       if config.daemon
-        Process.daemon
+        Process.daemon  true, true
 
         File.open(config.pidfile_path, 'w:UTF-8') do |f|
           f.puts $$
@@ -19,7 +21,6 @@ module Arsenicum
       configure_log config
 
       threads = config.queue_configurations.map{|qc|qc.build.start_async}
-
       begin
         threads.each(&:join)
       rescue Interrupt

data/lib/arsenicum/version.rb

@@ -1,3 +1,3 @@
 module Arsenicum
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

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