Changeset 1592

Timestamp:

07/02/05 04:52:14 (3 years ago)

Author:

bitsweat

Message:

r1588@asus: jeremy | 2005-07-02 03:14:45 -0700
Optional periodic garbage collection for dispatch.fcgi. Graceful exit on TERM also (a la Apache1). Ignore signals the platform does not support, such as USR1 on Windows.

Files:

• trunk/railties/CHANGELOG (modified) (1 diff)
• trunk/railties/dispatches/dispatch.fcgi (modified) (1 diff)
• trunk/railties/lib/fcgi_handler.rb (modified) (4 diffs)
• trunk/railties/test/fcgi_dispatcher_test.rb (modified) (5 diffs)
• trunk/railties/test/mocks/dispatcher.rb (modified) (1 diff)
• trunk/railties/test/mocks/fcgi.rb (modified) (1 diff)

trunk/railties/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* SIGTERM also gracefully exits dispatch.fcgi.  Ignore SIGUSR1 on Windows.
+
+* Add the option to manually manage garbage collection in the FastCGI dispatcher.  Set the number of requests between GC runs in your public/dispatch.fcgi.  [skaes@web.de]
-
-* Allow dynamic application reloading for dispatch.fcgi processes by sending a SIGHUP. If the process is currently handling a request, the request will be allowed to complete first. This allows production fcgi's to be reloaded without having to restart them.

trunk/railties/dispatches/dispatch.fcgi

@@ -1 +1 @@
-#!/usr/local/bin/ruby
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-require File.dirname(__FILE__) + "/../config/environment"
-require 'fcgi_handler'

trunk/railties/lib/fcgi_handler.rb

@@ -4 +4 @@
-
-class RailsFCGIHandler
+  SIGNALS = {
+    'HUP'  => :reload,
+    'TERM' => :graceful_exit,
+    'USR1' => :graceful_exit
+  }
+
-  attr_reader :when_ready
-  attr_reader :processing
-
-
-
+
+
+
+
+
+
+
-  end
-
-
+
+
+
+
+
+
-    @when_ready = nil
-    @processing = false
-
-trap("HUP",  method(:restart_handler).to_proc)
-trap("USR1", method(:trap_handler).to_proc)
+self.log_file_path = log_file_path || "#{RAILS_ROOT}/log/fastcgi.crash.log"
+self.gc_request_period = gc_request_period
-
-
+
+
+
+
+
+
+
-    @last_error_on = Time.now - 11
-
-    @log_file_path = log_file_path
-    dispatcher_log(:info, "starting")
-  end
-
-  def process!
+    # Make a note of $" so we can safely reload this instance.
-    mark!
-
+    # Begin countdown to garbage collection.
+    run_gc! if gc_request_period
+
-    FCGI.each_cgi do |cgi| 
-
+
+
+
-        restore!
-        @when_ready = nil
-start
+load
-      end
-
-      process_request(cgi)
+
+      # Break if graceful exit requested.
-      break if when_ready == :exit
+
+      # Garbage collection countdown.
+      if gc_request_period
+        @gc_request_countdown -= 1
+        run_gc! if @gc_request_countdown <= 0
+      end
-    end
-
+    GC.enable
-    dispatcher_log(:info, "terminated gracefully")
-
@@ -76 +112 @@
-    end
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-      if processing
-        dispatcher_log :info, "asked to terminate ASAP"
@@ -86 +134 @@
-    end
-
-start
-start
-start
+load
+load
+load
-    end
-
@@ -110 +158 @@
-      ActionController::Routing::Routes.reload
-    end
+
+    def run_gc!
+      @gc_request_countdown = gc_request_period
+      GC.enable; GC.start; GC.disable
+    end
-end

trunk/railties/test/fcgi_dispatcher_test.rb

@@ -10 +10 @@
-class RailsFCGIHandler
-  attr_reader :exit_code
-start
+load
-  attr_accessor :thread
+  attr_reader :gc_runs
-
-  def trap(signal, handler, &block)
@@ -28 +29 @@
-
-  def restore!
-
+
+
+
+
+
+
+
+
-  end
-end
@@ -58 +66 @@
-    assert_nil @handler.when_ready
-    assert !@handler.processing
-start
+load
-  end
-
@@ -68 +76 @@
-    @handler.thread.join
-    assert_nil @handler.exit_code
-start
+load
-    assert !@handler.processing
-  end
@@ -120 +128 @@
-  end
-end
+
+class RailsFCGIHandlerPeriodicGCTest < Test::Unit::TestCase
+  def setup
+    @log = StringIO.new
+    FCGI.time_to_sleep = nil
+    FCGI.raise_exception = nil
+    FCGI.each_cgi_count = nil
+    Dispatcher.time_to_sleep = nil
+    Dispatcher.raise_exception = nil
+    Dispatcher.dispatch_hook = nil
+  end
+
+  def teardown
+    FCGI.each_cgi_count = nil
+    Dispatcher.dispatch_hook = nil
+    GC.enable
+  end
+
+  def test_normal_gc
+    @handler = RailsFCGIHandler.new(@log)
+    assert_nil @handler.gc_request_period
+
+    # When GC is enabled, GC.disable disables and returns false.
+    assert_equal false, GC.disable
+  end
+
+  def test_periodic_gc
+    Dispatcher.dispatch_hook = lambda do |cgi|
+      # When GC is disabled, GC.enable enables and returns true.
+      assert_equal true, GC.enable
+      GC.disable
+    end
+
+    @handler = RailsFCGIHandler.new(@log, 10)
+    assert_equal 10, @handler.gc_request_period
+    FCGI.each_cgi_count = 1
+    @handler.process!
+    assert_equal 1, @handler.gc_runs
+
+    FCGI.each_cgi_count = 10
+    @handler.process!
+    assert_equal 3, @handler.gc_runs
+
+    FCGI.each_cgi_count = 25
+    @handler.process!
+    assert_equal 6, @handler.gc_runs
+
+    assert_nil @handler.exit_code
+    assert_nil @handler.when_ready
+    assert !@handler.processing
+  end
+end

trunk/railties/test/mocks/dispatcher.rb

@@ -3 +3 @@
-    attr_accessor :time_to_sleep
-    attr_accessor :raise_exception
+    attr_accessor :dispatch_hook
-
-    def dispatch(cgi)
+      dispatch_hook.call(cgi) if dispatch_hook
-      sleep(time_to_sleep || 0)
-      raise raise_exception, "Something died" if raise_exception

trunk/railties/test/mocks/fcgi.rb

@@ -3 +3 @@
-    attr_accessor :time_to_sleep
-    attr_accessor :raise_exception
+    attr_accessor :each_cgi_count
-
-    def each_cgi
-
-
-
+
+
+
+
+
-    end
-  end