arsenicum 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 227759f26fc6a576603f6ea5454a801b952c61e5
-  data.tar.gz: c6ce1168091c355e7a2258a1f181c28c18899121
+  metadata.gz: 27b879f93b75e38c1799be9550a235779497b313
+  data.tar.gz: f2de0aa396dcb3ec54f80a36a88ce69e49b31489
 SHA512:
-  metadata.gz: de846aa8417608539d5d28a85cb66a8c3f6737d25300474d6adf6fa339185de70b9a115c8ec509ce864b1dfa013da41f5e253055de17eb0a9792b1cda5b9e59c
-  data.tar.gz: 928123fa45f80afb3ae8f98117b3b00da665f42017e77f46d80279f7aba28c801d770e23f8768a365eb61ea668e0d94c0d7c97f6d23143b8efde10ba6b5d31b3
+  metadata.gz: 97a35d672a0d6fd3f42ef2b7d8fdbeed32b8b768aab0a60f3bba8cb3964a544f05749d6523d1ae35e4a315cfaf9067544c49f44672575cbc493d847ca9dc0a02
+  data.tar.gz: 5e9d80d8df1ae7eed0f5502d081645645f8141d0c858ecf9ed57bb9a76cff79847327b006afc2a4c41cce038802550a3d2b70f9d3cc0ae3fbcba7e5e281846de

data/lib/arsenicum/core/broker.rb

@@ -55,6 +55,10 @@ class Arsenicum::Core::Broker
     broker success_handler, failure_handler, task_id, parameters
   end
 
+  def stop
+    workers.values.map(&:stop)
+  end
+
   def remove(worker)
     mutex.synchronize do
       workers.delete(worker.pid)
@@ -63,7 +67,7 @@ class Arsenicum::Core::Broker
   end
 
   def reload
-    workers.each(&:stop)
+    workers.values.each(&:stop)
 
     workers.clear
     available_workers.clear

data/lib/arsenicum/core/worker.rb

@@ -67,6 +67,9 @@ class Arsenicum::Core::Worker
   end
 
   def stop
+    thread.terminate
+    return if Process.waitpid pid, Process::WNOHANG
+
     write_message   ctrl_out_parent, COMMAND_STOP
     Process.waitpid pid
   end
@@ -91,6 +94,13 @@ 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
@@ -141,7 +151,8 @@ class Arsenicum::Core::Worker
       control, = read_message ctrl_in_child
       case control
         when CONTROL_STOP
-          thread.stop
+          info message: '[Control]Received stop command.'
+          thread.terminate
           switch_state  :stopped
       end
     end
@@ -205,13 +216,21 @@ class Arsenicum::Core::Worker
     def initialize(worker)
       super do
         loop do
-          next sleep(0.5) unless task_request
+          begin
+            next sleep(0.5) unless task_request
+          rescue Interrupt
+            break
+          end
           (success_handler, failure_handler, task_id, parameter) = task_request
 
           begin
             worker.ask task_id, *parameter
             info worker, message: "Completed processing: #{task_id}"
             success_handler.call
+          rescue Interrupt => e
+            error worker, exception: e
+            failure_handler.call e
+            break
           rescue Exception => e
             error worker, exception: e
             failure_handler.call e

data/lib/arsenicum/main.rb

@@ -52,8 +52,11 @@ module Arsenicum
 
     def trap_signal
       [:TERM, :INT,].each do |sig|
-        queues.each(&:stop)
-        exit 1
+        Signal.trap sig do
+puts "signal received"
+          queues.each(&:stop)
+          exit 1
+        end
       end
     end
 

data/lib/arsenicum/version.rb

@@ -1,3 +1,3 @@
 module Arsenicum
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

metadata

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