aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorJamis Buck <jamis@37signals.com>2005-06-27 11:32:39 +0000
committerJamis Buck <jamis@37signals.com>2005-06-27 11:32:39 +0000
commit5205e08e76ecb472784b7237fc8195c66689aa78 (patch)
tree9249662d1f66349845ecda5e5336246addde503b /railties
parentef8bd07f5e8a420896f41d92e2b5188c5ea3c6c8 (diff)
downloadrails-5205e08e76ecb472784b7237fc8195c66689aa78.tar.gz
rails-5205e08e76ecb472784b7237fc8195c66689aa78.tar.bz2
rails-5205e08e76ecb472784b7237fc8195c66689aa78.zip
Had some logic backwards in the new dispatch.fcgi handler
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1540 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties')
-rwxr-xr-xrailties/dispatches/dispatch.fcgi4
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/dispatches/dispatch.fcgi b/railties/dispatches/dispatch.fcgi
index e27a7e03c1..684f04db86 100755
--- a/railties/dispatches/dispatch.fcgi
+++ b/railties/dispatches/dispatch.fcgi
@@ -22,7 +22,7 @@ class RailsFCGIHandler
trap("USR1", trap_handler)
# initialize to 11 seconds from now to minimize special cases
- @last_error_on = Time.now + 11
+ @last_error_on = Time.now - 11
@log_file_path = log_file_path
dispatcher_log(:info, "fcgi #{$$} starting")
@@ -42,7 +42,7 @@ class RailsFCGIHandler
rescue Object => fcgi_error
# retry on errors that would otherwise have terminated the FCGI process,
# but only if they occur more than 10 seconds apart.
- if !(SignalException === fcgi_error) && @last_error_on - Time.now > 10
+ if !(SignalException === fcgi_error) && Time.now - @last_error_on > 10
@last_error_on = Time.now
dispatcher_error(fcgi_error,
"FCGI process #{$$} almost killed by this error\n")