diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-11-13 00:54:57 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-11-13 00:54:57 +0000 |
| commit | 78fb61a1fa3403bcaf616c5794f2ef764db3fd66 (patch) | |
| tree | 4ae1d0c6bd5cd5dd14ed3c2f9cfc45e47899742b /railties | |
| parent | 578c7a18e4e26524bef449a312c499c2bb2ec1d8 (diff) | |
| download | rails-78fb61a1fa3403bcaf616c5794f2ef764db3fd66.tar.gz rails-78fb61a1fa3403bcaf616c5794f2ef764db3fd66.tar.bz2 rails-78fb61a1fa3403bcaf616c5794f2ef764db3fd66.zip | |
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
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/fcgi_handler.rb | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index c3817d3d63..87805fd1e7 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* FastCGI handler ignores unsupported signals like USR2 on Windows. [Grzegorz Derebecki] + * 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] diff --git a/railties/lib/fcgi_handler.rb b/railties/lib/fcgi_handler.rb index 2b0d7b1916..a644161e7f 100644 --- a/railties/lib/fcgi_handler.rb +++ b/railties/lib/fcgi_handler.rb @@ -133,7 +133,12 @@ class RailsFCGIHandler def install_signal_handler(signal, handler = nil) if SIGNALS.include?(signal) && self.class.method_defined?(name = "#{SIGNALS[signal]}_handler") handler ||= method(name).to_proc - trap(signal, handler) + + begin + trap(signal, handler) + rescue ArgumentError + dispatcher_log :warn, "Ignoring unsupported signal #{signal}." + end else dispatcher_log :warn, "Ignoring unsupported signal #{signal}." end |