aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xrailties/dispatches/dispatch.fcgi2
-rw-r--r--railties/test/fcgi_dispatcher_test.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/dispatches/dispatch.fcgi b/railties/dispatches/dispatch.fcgi
index ed04839d6f..2d298c1935 100755
--- a/railties/dispatches/dispatch.fcgi
+++ b/railties/dispatches/dispatch.fcgi
@@ -71,7 +71,7 @@ class RailsFCGIHandler
dispatcher_log(:error, error_message)
end
- def trap_handler
+ def trap_handler(signal)
if i_am_currently_processing_a_request
dispatcher_log(:info, "asking #{$$} to terminate ASAP")
@please_exit_at_your_earliest_convenience = true
diff --git a/railties/test/fcgi_dispatcher_test.rb b/railties/test/fcgi_dispatcher_test.rb
index 3aeb447fa1..466eefe225 100644
--- a/railties/test/fcgi_dispatcher_test.rb
+++ b/railties/test/fcgi_dispatcher_test.rb
@@ -23,7 +23,7 @@ class RailsFCGIHandler
end
def send_signal(which)
- @signal_handlers[which].call
+ @signal_handlers[which].call(which)
end
end