Changeset 1284

Timestamp:

05/04/05 11:10:13 (4 years ago)

Author:

david

Message:

Made dispatch.fcgi more robust by catching fluke errors and retrying unless its a permanent condition. [Jamis Buck] Allow graceful exits for dispatch.fcgi processes by sending a SIGUSR1. If the process is currently handling a request, the request will be allowed to complete and then will terminate itself. If a request is not being handled, the process is terminated immediately (via #exit). This basically works like restart graceful on Apache. [Jamis Buck]

Files:

• trunk/railties/CHANGELOG (modified) (1 diff)
• trunk/railties/dispatches/dispatch.fcgi (modified) (2 diffs)

trunk/railties/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+
+* Allow graceful exits for dispatch.fcgi processes by sending a SIGUSR1. If the process is currently handling a request, the request will be allowed to complete and then will terminate itself. If a request is not being handled, the process is terminated immediately (via #exit). This basically works like restart graceful on Apache. [Jamis Buck]
+
+* Made dispatch.fcgi more robust by catching fluke errors and retrying unless its a permanent condition. [Jamis Buck]
-
-* Added console --profile for profiling an IRB session #1154 [bitsweat]

trunk/railties/dispatches/dispatch.fcgi

@@ -1 +1 @@
-#!/usr/local/bin/ruby
+
+def dispatcher_log(level, path,msg)
+  Logger.new(path).send(level, msg)
+rescue Object => log_error
+  STDERR << "Couldn't write to #{path}: #{msg}"
+end
-
-def dispatcher_error(path,e,msg="")
-  error_message =
-    "[#{Time.now}] Dispatcher failed to catch: #{e} (#{e.class})\n  #{e.backtrace.join("\n  ")}\n#{msg}"
-
-
-
+
-end
-
+last_error_on = nil
-begin
-  require File.dirname(__FILE__) + "/../config/environment"
@@ -15 +20 @@
-
-  log_file_path = "#{RAILS_ROOT}/log/fastcgi.crash.log"
+  dispatcher_log(:info, log_file_path, "fcgi #{$$} starting")
+
+  # Allow graceful exits by sending the process SIGUSR1. If the process is
+  # currently handling a request, the request will be allowed to complete and
+  # then will terminate itself. If a request is not being handled, the
+  # process is terminated immediately (via #exit).
+
+  $please_exit_at_your_earliest_convenience = false
+  $i_am_currently_processing_a_request = false
+  trap("USR1") do
+    if $i_am_currently_processing_a_request
+      dispatcher_log(:info, log_file_path, "asking #{$$} to terminate ASAP")
+      $please_exit_at_your_earliest_convenience = true
+    else
+      dispatcher_log(:info, log_file_path, "telling #{$$} to terminate NOW")
+      exit
+    end
+  end
+
+  # Process each request as it comes in, as a pseudo-CGI.
-
-  FCGI.each_cgi do |cgi| 
-    begin
+      $i_am_currently_processing_a_request = true
-      Dispatcher.dispatch(cgi)
-
-
+
+
+
+
+
+
-    end
-  end
+
+  dispatcher_log(:info, log_file_path, "fcgi #{$$} terminated gracefully")
+rescue SystemExit => exit_error
+  dispatcher_log(:info, log_file_path, "fcgi #{$$} terminated by explicit exit")
-rescue Object => fcgi_error
-
+
+
+
+
+
+
+
+
+
-end