Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 8132

Show
Ignore:
Timestamp:
11/13/07 00:54:57 (1 year ago)
Author:
bitsweat
Message:

FastCGI handler ignores unsupported signals like USR2 on Windows [Grzegorz Derebecki]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/railties/CHANGELOG

    r8127 r8132  
    11*SVN* 
     2 
     3* FastCGI handler ignores unsupported signals like USR2 on Windows.  [Grzegorz Derebecki] 
    24 
    35* Only load ActionMailer::TestCase if ActionMailer is loaded.  Closes #10137 [defunkt] 

  • trunk/railties/lib/fcgi_handler.rb

    r7593 r8132  
    134134      if SIGNALS.include?(signal) && self.class.method_defined?(name = "#{SIGNALS[signal]}_handler") 
    135135        handler ||= method(name).to_proc 
    136         trap(signal, handler) 
     136 
     137        begin 
     138          trap(signal, handler) 
     139        rescue ArgumentError 
     140          dispatcher_log :warn, "Ignoring unsupported signal #{signal}." 
     141        end 
    137142      else 
    138143        dispatcher_log :warn, "Ignoring unsupported signal #{signal}."