Handle early term in workers. Fixes #206

puma · Mar 19, 2013 · 86b9bf5 · 86b9bf5
1 parent d38de8f
commit 86b9bf5
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/lib/puma/cli.rb b/lib/puma/cli.rb
@@ -662,10 +662,20 @@ def run_cluster
       rescue Exception
       end
 
+      master_pid = Process.pid
+
       begin
         Signal.trap "SIGTERM" do
-          stop = true
-          write.write "!"
+          # The worker installs there own SIGTERM when booted.
+          # Until then, this is run by the worker and the worker
+          # should just exit if they get it.
+          if Process.pid != master_pid
+            log "Early termination of worker"
+            exit! 0
+          else
+            stop = true
+            write.write "!"
+          end
         end
       rescue Exception
       end