sponges 0.5.0.1.pre → 0.5.0.2.pre

data/lib/sponges.rb

@@ -3,7 +3,9 @@ require 'boson/runner'
 require 'socket'
 require 'logger'
 require 'machine'
+require 'forwardable'
 require_relative 'sponges/configuration'
+require_relative 'sponges/handler'
 require_relative 'sponges/supervisor'
 require_relative 'sponges/runner'
 require_relative 'sponges/commander'
@@ -13,7 +15,8 @@ require_relative 'sponges/store/memory'
 require_relative 'sponges/store/redis'
 
 module Sponges
-  SIGNALS = [:INT, :QUIT, :TERM]
+  STOP_SIGNALS = [:INT, :QUIT, :TERM]
+  SIGNALS = STOP_SIGNALS + [:HUP, :TTIN, :TTOU, :CHLD]
 
   def configure(&block)
     Sponges::Configuration.configure &block

data/lib/sponges/commander.rb

@@ -106,7 +106,7 @@ module Sponges
     end
 
     def alive?(pid)
-      !!Sys::ProcTable.ps.find {|f| f.pid == pid }.nil?
+      !Sys::ProcTable.ps.find {|f| f.pid == pid }.nil?
     end
 
     def gracefully?

data/lib/sponges/handler.rb

@@ -0,0 +1,116 @@
+# encoding: utf-8
+module Sponges
+  class Handler
+    extend Forwardable
+    attr_reader :supervisor
+
+    def initialize(supervisor)
+      @supervisor = supervisor
+      at_exit do
+        for_supervisor do
+          Sponges.logger.info "Supervisor exits."
+        end
+      end
+    end
+
+    def call(signal)
+      if Sponges::SIGNALS.include?(signal = find_signal(signal))
+        send "handler_#{signal.to_s.downcase}", signal
+      end
+    end
+
+    def_delegators :@supervisor, :store, :fork_children, :name, :children_name
+
+    private
+
+    def for_supervisor
+      yield if Process.pid == store.supervisor_pid
+    end
+
+    def find_signal(signal)
+      return signal if signal.is_a?(Symbol)
+      if signal = Signal.list.find {|k,v| v == signal }
+        signal.first.to_sym
+      end
+    end
+
+    def handler_ttin(signal)
+      for_supervisor do
+        Sponges.logger.warn "Supervisor increment child's pool by one."
+        fork_children
+      end
+    end
+
+    def handler_ttou(signal)
+      for_supervisor do
+        Sponges.logger.warn "Supervisor decrement child's pool by one."
+        if store.children_pids.first
+          kill_one(store.children_pids.first, :HUP)
+          store.delete_children(store.children_pids.first)
+        else
+          Sponges.logger.warn "No more child to kill."
+        end
+      end
+    end
+
+    def handler_chld(signal)
+      for_supervisor do
+        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::Hook.on_chld
+              fork_children
+            end
+          rescue Errno::ECHILD => e
+            # Don't panic
+          end
+        end
+      end
+    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
+    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
+    end
+
+    def kill_one(pid, signal)
+      begin
+        Process.kill signal, pid
+        Process.waitpid pid
+        Sponges.logger.info "Child #{pid} receive a #{signal} signal."
+      rescue Errno::ESRCH, Errno::ECHILD, SignalException => e
+        # Don't panic
+      end
+    end
+
+    def fork_children
+      name = children_name
+      pid = fork do
+        $PROGRAM_NAME = name
+        (Sponges::STOP_SIGNALS + [:HUP]).each{ |sig| trap(sig) { exit!(0) } }
+        Sponges::Hook.after_fork
+        supervisor.call
+      end
+      Sponges.logger.info "Supervisor create a child with #{pid} pid."
+      store.add_children pid
+    end
+  end
+end

data/lib/sponges/runner.rb

@@ -50,7 +50,6 @@ module Sponges
 
     def fork_supervisor
       fork do
-        $PROGRAM_NAME = "#{@name}_supervisor"
         Supervisor.new(@name, @options, store, @block).start
       end
     end

data/lib/sponges/store/memory.rb

@@ -1,6 +1,4 @@
 # encoding: utf-8
-require 'forwardable'
-
 module Sponges
   class Store
     class Memory

data/lib/sponges/supervisor.rb

@@ -1,111 +1,45 @@
 # encoding: utf-8
 module Sponges
   class Supervisor
-    attr_reader :store, :name, :options
+    attr_reader :store, :name, :options, :handler
 
     def initialize(name, options, store, block)
       @name, @options, @store, @block = name, options, store, block
+      $PROGRAM_NAME = "#{@name}_supervisor"
       store.on_fork
       store.register Process.pid
       @children_seen = 0
+      @handler = Handler.new self
     end
 
     def start
       trap_signals
-      at_exit do
-        Sponges.logger.info "Supervisor exits."
-      end
       options[:size].times do
-        fork_children
+        handler.call :TTIN
       end
       Sponges.logger.info "Supervisor started, waiting for messages."
       sleep
     rescue Exception => exception
       Sponges.logger.error exception
-      kill_them_all(:INT)
+      handler.call :INT
       raise exception
     end
 
-    private
-
-    def fork_children
-      name = children_name
-      pid = fork do
-        $PROGRAM_NAME = name
-        (Sponges::SIGNALS + [:HUP]).each{ |sig| trap(sig) { exit!(0) } }
-        Sponges::Hook.after_fork
-        @block.call
-      end
-      Sponges.logger.info "Supervisor create a child with #{pid} pid."
-      store.add_children pid
+    def call
+      @block.call
     end
 
+    private
+
     def children_name
       "#{name}_child_#{@children_seen +=1}"
     end
 
     def trap_signals
-      (Sponges::SIGNALS + [:HUP]).each do |signal|
-        trap(signal) do
-          handle_signal signal
-        end
-      end
-      trap(:TTIN) do
-        Sponges.logger.warn "Supervisor increment child's pool by one."
-        fork_children
-      end
-      trap(:TTOU) do
-        Sponges.logger.warn "Supervisor decrement child's pool by one."
-        if store.children_pids.first
-          kill_one(store.children_pids.first, :HUP)
-          store.delete_children(store.children_pids.first)
-        else
-          Sponges.logger.warn "No more child to kill."
-        end
-      end
-      trap(:CHLD) do
-        store.children_pids.each do |pid|
-          begin
-            dead = Process.waitpid(pid.to_i, Process::WNOHANG)
-            if dead
-              Sponges.logger.warn "Child #{dead} died. Restarting a new one..."
-                store.delete_children dead
-              Sponges::Hook.on_chld
-              fork_children
-            end
-          rescue Errno::ECHILD => e
-            # Don't panic
-          end
-        end
-      end
-    end
-
-    def handle_signal(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
-    end
-
-    def kill_them_all(signal)
-      store.children_pids.each do |pid|
-        kill_one(pid.to_i, signal)
+      Sponges::SIGNALS.each do |signal|
+        trap(signal) {|signal| handler.call signal }
       end
     end
 
-    def kill_one(pid, signal)
-      begin
-        Process.kill signal, pid
-        Process.waitpid pid
-        Sponges.logger.info "Child #{pid} receive a #{signal} signal."
-      rescue Errno::ESRCH, Errno::ECHILD, SignalException => e
-        # Don't panic
-      end
-    end
   end
 end

data/lib/sponges/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sponges
 version: !ruby/object:Gem::Version
-  version: 0.5.0.1.pre
+  version: 0.5.0.2.pre
   prerelease: 8
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-28 00:00:00.000000000 Z
+date: 2013-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: boson
@@ -75,6 +75,7 @@ files:
 - lib/sponges/cli.rb
 - lib/sponges/commander.rb
 - lib/sponges/configuration.rb
+- lib/sponges/handler.rb
 - lib/sponges/runner.rb
 - lib/sponges/store.rb
 - lib/sponges/store/memory.rb