Refactoring signal handling

andrewtimberlake · Nov 29, 2012 · 6898baa · 6898baa
1 parent 30a826d
commit 6898baa
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/lib/cascade/master.rb b/lib/cascade/master.rb
@@ -8,14 +8,17 @@ def initialize(worker_class=Worker)
     attr_reader :worker_class
     attr_accessor :children
 
-    CHILDREN = []
+    CHILDREN       = []
-    SIG_QUEUE = []
+    SIG_QUEUE      = []
-    SELF_PIPE = []
+    SELF_PIPE      = []
+    QUIT_SIGNALS   = [:TERM, :INT, :QUIT]
+    MASTER_SIGNALS = [:TTIN, :TTOU, :CHLD, :USR2]
+    WORKER_SIGNALS = []
 
     def start(workers=2)
       init_self_pipe!
 
-      [:TERM, :INT, :QUIT, :TTIN, :TTOU, :CHLD].each do |sig|
+      (QUIT_SIGNALS + MASTER_SIGNALS).each do |sig|
         trap(sig) do
           SIG_QUEUE << sig
           awaken_master
@@ -92,10 +95,10 @@ def reap_all_workers
 
     def fork_worker(number)
       fork do
-        [:TTIN, :TTOU].each do |sig|
+        MASTER_SIGNALS.each do |sig|
           trap(sig) {}
         end
-        [:TERM, :INT, :QUIT].each do |sig|
+        QUIT_SIGNALS.each do |sig|
           trap(sig) do
             $exit = true
           end