Daemons should die when receiving a TERM signal.

quirkey · May 9, 2011 · 6dffd5f · 6dffd5f
1 parent 5211c46
commit 6dffd5f
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/lib/vegas/runner.rb b/lib/vegas/runner.rb
@@ -171,11 +171,13 @@ def run!
       logger.info "Running with Rack handler: #{@rack_handler.inspect}"
 
       rack_handler.run app, :Host => host, :Port => port do |server|
-        trap(kill_command) do
-          ## Use thins' hard #stop! if available, otherwise just #stop
-          server.respond_to?(:stop!) ? server.stop! : server.stop
-          logger.info "#{quoted_app_name} received INT ... stopping"
-          delete_pid!
+        kill_commands.each do |command|
+          trap(command) do
+            ## Use thins' hard #stop! if available, otherwise just #stop
+            server.respond_to?(:stop!) ? server.stop! : server.stop
+            logger.info "#{quoted_app_name} received INT ... stopping"
+            delete_pid!
+          end
         end
       end
     end
@@ -378,8 +380,8 @@ def define_options
       exit
     end
 
-    def kill_command
-      WINDOWS ? 1 : :INT
+    def kill_commands
+      WINDOWS ? [1] : [:INT, :TERM]
     end
 
     def delete_pid!