Trap the exit instead of specific signals, and preserve a possibly ex…

…isting handler
tddium · Apr 12, 2011 · 6425a5a · 6425a5a
1 parent ad1ff73
commit 6425a5a
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/lib/mimic.rb b/lib/mimic.rb
@@ -10,8 +10,7 @@ module Mimic
     :hostname => 'localhost',
     :port => MIMIC_DEFAULT_PORT,
     :remote_configuration_path => nil,
-    :fork => true,
-    :trap_signals => true
+    :fork => true
   }
 
   def self.mimic(options = {}, &block)
@@ -67,9 +66,9 @@ def start_service(app, options)
       }) do |server|
         @server = server
 
-        if options[:trap_signals]
-          trap("TERM") { @server.shutdown }
-          trap("INT")  { @server.shutdown }
+        old = trap('EXIT') do
+          old.call if old
+          @server.shutdown
         end
       end
     end