mirror of
https://github.com/github/rails.git
synced 2026-01-13 00:28:26 -05:00
Fix FCGI handler with lighttpd [#1854 state:resolved]
This commit is contained in:
@@ -38,6 +38,8 @@ class RailsFCGIHandler
|
||||
# Safely install signal handlers.
|
||||
install_signal_handlers
|
||||
|
||||
@app = Dispatcher.new
|
||||
|
||||
# Start error timestamp at 11 seconds ago.
|
||||
@last_error_on = Time.now - 11
|
||||
end
|
||||
@@ -72,8 +74,8 @@ class RailsFCGIHandler
|
||||
cgi = nil
|
||||
|
||||
catch :exit do
|
||||
provider.each_cgi do |cgi|
|
||||
process_request(cgi)
|
||||
provider.each do |request|
|
||||
process_request(request)
|
||||
|
||||
case when_ready
|
||||
when :reload
|
||||
@@ -92,13 +94,13 @@ class RailsFCGIHandler
|
||||
close_connection(cgi)
|
||||
end
|
||||
|
||||
def process_request(cgi)
|
||||
def process_request(request)
|
||||
@processing, @when_ready = true, nil
|
||||
gc_countdown
|
||||
|
||||
with_signal_handler 'USR1' do
|
||||
begin
|
||||
::Rack::Handler::FastCGI.serve(cgi, Dispatcher.new)
|
||||
::Rack::Handler::FastCGI.serve(request, @app)
|
||||
rescue SignalException, SystemExit
|
||||
raise
|
||||
rescue Exception => error
|
||||
|
||||
Reference in New Issue
Block a user