sponges 0.5.0.2.pre → 0.5.0.3.pre

data/lib/sponges/handler.rb

@@ -55,11 +55,12 @@ module Sponges
 
     def handler_chld(signal)
       for_supervisor do
+        return if stopping?
         store.children_pids.each do |pid|
           begin
             if dead = Process.waitpid(pid.to_i, Process::WNOHANG)
-              Sponges.logger.warn "Child #{dead} died. Restarting a new one..."
               store.delete_children dead
+              Sponges.logger.warn "Child #{dead} died. Restarting a new one..."
               Sponges::Hook.on_chld
               fork_children
             end
@@ -71,24 +72,20 @@ module Sponges
     end
 
     def handler_int(signal)
-      Sponges.logger.info "Supervisor received #{signal} signal."
-      kill_them_all(signal)
-      Process.waitall
-      Sponges.logger.info "Children shutdown complete."
-      Sponges.logger.info "Supervisor shutdown. Exiting..."
-      store.clear(name)
-      exit
-    rescue Errno::ESRCH, Errno::ECHILD, SignalException => e
-      # Don't panic
+      for_supervisor do
+        @stopping = true
+        Sponges.logger.info "Supervisor received #{signal} signal."
+        kill_them_all(signal) and shutdown
+      end
     end
 
     alias handler_quit handler_int
     alias handler_term handler_int
 
     def kill_them_all(signal)
-      store.children_pids.each do |pid|
-        kill_one(pid.to_i, signal)
-      end
+      store.children_pids.map do |pid|
+        Thread.new { kill_one(pid.to_i, signal) }
+      end.each &:join
     end
 
     def kill_one(pid, signal)
@@ -101,6 +98,15 @@ module Sponges
       end
     end
 
+    def shutdown
+      Process.waitall
+      Sponges.logger.info "Children shutdown complete.", "Supervisor shutdown. Exiting..."
+      store.clear(name)
+      exit
+    rescue Errno::ESRCH, Errno::ECHILD, SignalException => e
+      # Don't panic
+    end
+
     def fork_children
       name = children_name
       pid = fork do
@@ -112,5 +118,9 @@ module Sponges
       Sponges.logger.info "Supervisor create a child with #{pid} pid."
       store.add_children pid
     end
+
+    def stopping?
+      @stopping
+    end
   end
 end

data/lib/sponges/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Sponges
-  VERSION = "0.5.0.2.pre"
+  VERSION = "0.5.0.3.pre"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sponges
 version: !ruby/object:Gem::Version
-  version: 0.5.0.2.pre
+  version: 0.5.0.3.pre
   prerelease: 8
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-29 00:00:00.000000000 Z
+date: 2013-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: boson
@@ -107,3 +107,4 @@ signing_key:
 specification_version: 3
 summary: Turn any ruby object to a daemon controlling an army of sponges.
 test_files: []
+has_rdoc: