mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
FastCGI handler ignores unsupported signals like USR2 on Windows [Grzegorz Derebecki]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8132 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
578c7a18e4
commit
78fb61a1fa
2 changed files with 8 additions and 1 deletions
|
@ -1,5 +1,7 @@
|
||||||
*SVN*
|
*SVN*
|
||||||
|
|
||||||
|
* FastCGI handler ignores unsupported signals like USR2 on Windows. [Grzegorz Derebecki]
|
||||||
|
|
||||||
* Only load ActionMailer::TestCase if ActionMailer is loaded. Closes #10137 [defunkt]
|
* Only load ActionMailer::TestCase if ActionMailer is loaded. Closes #10137 [defunkt]
|
||||||
|
|
||||||
* Fixed that db:reset would use migrations instead of loading db/schema.rb [DHH]
|
* Fixed that db:reset would use migrations instead of loading db/schema.rb [DHH]
|
||||||
|
|
|
@ -133,7 +133,12 @@ class RailsFCGIHandler
|
||||||
def install_signal_handler(signal, handler = nil)
|
def install_signal_handler(signal, handler = nil)
|
||||||
if SIGNALS.include?(signal) && self.class.method_defined?(name = "#{SIGNALS[signal]}_handler")
|
if SIGNALS.include?(signal) && self.class.method_defined?(name = "#{SIGNALS[signal]}_handler")
|
||||||
handler ||= method(name).to_proc
|
handler ||= method(name).to_proc
|
||||||
trap(signal, handler)
|
|
||||||
|
begin
|
||||||
|
trap(signal, handler)
|
||||||
|
rescue ArgumentError
|
||||||
|
dispatcher_log :warn, "Ignoring unsupported signal #{signal}."
|
||||||
|
end
|
||||||
else
|
else
|
||||||
dispatcher_log :warn, "Ignoring unsupported signal #{signal}."
|
dispatcher_log :warn, "Ignoring unsupported signal #{signal}."
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue