Changeset 4913

Timestamp:

09/03/06 00:18:31 (2 years ago)

Author:

bitsweat

Message:

Thoroughly test the FCGI dispatcher. Closes #5970.

Files:

• trunk/railties/CHANGELOG (modified) (1 diff)
• trunk/railties/lib/fcgi_handler.rb (modified) (3 diffs)
• trunk/railties/test/abstract_unit.rb (added)
• trunk/railties/test/fcgi_dispatcher_test.rb (modified) (6 diffs)
• trunk/railties/test/mocks/routes.rb (added)
• trunk/railties/test/mocks/stubbed_breakpoint.rb (added)
• trunk/railties/test/mocks/stubbed_kernel.rb (added)

trunk/railties/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Thoroughly test the FCGI dispatcher.  #5970 [Kevin Clark]
-
-* Remove Dir.chdir in the Webrick DispatchServlet#initialize method.  Fix bad path errors when trying to load config/routes.rb.  [Rick Olson]

trunk/railties/lib/fcgi_handler.rb

@@ -51 +51 @@
-    run_gc! if gc_request_period
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-    GC.enable
@@ -88 +70 @@
-    end
-  end
-
-
-ivate
+
+
+otected
-    def logger
-      @logger ||= Logger.new(@log_file_path)
@@ -145 +127 @@
-      dispatcher_log :info, "asked to breakpoint ASAP"
-      @when_ready = :breakpoint
+    end
+    
+    def process_each_request!(provider)
+      provider.each_cgi do |cgi| 
+        process_request(cgi)
+
+        case when_ready
+          when :reload
+            reload!
+          when :restart
+            close_connection(cgi)
+            restart!
+          when :exit
+            close_connection(cgi)
+            break
+          when :breakpoint
+            close_connection(cgi)
+            breakpoint!
+        end
+
+        gc_countdown
+      end
-    end
-

trunk/railties/test/fcgi_dispatcher_test.rb

@@ -1 @@
-
+
+
-$:.unshift File.dirname(__FILE__) + "/mocks"
-
-require 'test/unit'
-require 'stringio'
+
+# Stubs
-require 'fcgi_handler'
-
-
+
+
+
-
-class RailsFCGIHandler
@@ -27 +30 @@
-    @signal_handlers[which].call(which)
-  end
-
-
-
-
-
-
-
+
+
-  end
-
@@ -54 +52 @@
-  end
-
+  def test_process_restart
+    @handler.stubs(:when_ready).returns(:restart)
+    
+    @handler.expects(:close_connection)
+    @handler.expects(:restart!)
+    @handler.process!
+  end
+  
+  def test_process_exit
+    @handler.stubs(:when_ready).returns(:exit)
+    
+    @handler.expects(:close_connection)
+    @handler.process!
+  end
+  
+  def test_process_breakpoint
+    @handler.stubs(:when_ready).returns(:breakpoint)
+    
+    @handler.expects(:close_connection)
+    @handler.expects(:breakpoint!)
+    @handler.process!
+  end
+  
+  def test_process_with_system_exit_exception
+    @handler.stubs(:process_request).raises(SystemExit)
+    
+    @handler.expects(:dispatcher_log).with(:info, "terminated by explicit exit")
+    @handler.process!
+  end
+  
+  def test_restart_handler
+    @handler.expects(:dispatcher_log).with(:info, "asked to restart ASAP")
+    
+    @handler.send(:restart_handler, nil)
+    assert_equal :restart, @handler.when_ready
+  end
+  
+  def test_breakpoint_handler
+    @handler.expects(:dispatcher_log).with(:info, "asked to breakpoint ASAP")
+
+    @handler.send(:breakpoint_handler, nil)
+    assert_equal :breakpoint, @handler.when_ready
+  end
+  
+  def test_install_signal_handler_should_log_on_bad_signal
+    @handler.stubs(:trap).raises(ArgumentError)
+
+    @handler.expects(:dispatcher_log).with(:warn, "Ignoring unsupported signal CHEESECAKE.")
+    @handler.send(:install_signal_handler, "CHEESECAKE", nil)
+  end
+  
+  def test_reload
+    @handler.expects(:restore!)
+    @handler.expects(:dispatcher_log).with(:info, "reloaded")
+
+    @handler.send(:reload!)
+    assert_nil @handler.when_ready
+  end
+  
+  
+  def test_reload_runs_gc_when_gc_request_period_set
+    @handler.expects(:run_gc!)
+    @handler.expects(:restore!)
+    @handler.expects(:dispatcher_log).with(:info, "reloaded")
+    @handler.gc_request_period = 10
+    @handler.send(:reload!)
+  end
+  
+  def test_reload_doesnt_run_gc_if_gc_request_period_isnt_set
+    @handler.expects(:run_gc!).never
+    @handler.expects(:restore!)
+    @handler.expects(:dispatcher_log).with(:info, "reloaded")
+    @handler.send(:reload!)
+  end
+  
+  def test_restart!
+    @handler.expects(:dispatcher_log).with(:info, "restarted")
+    assert_equal true, @handler.send(:restart!), "Exec wasn't run"
+  end
+  
+  def test_restore!
+    $".expects(:replace)
+    Dispatcher.expects(:reset_application!)
+    ActionController::Routing::Routes.expects(:reload)
+    @handler.send(:restore!)
+  end
+
+  def test_breakpoint!
+    @handler.expects(:require).with('breakpoint')
+    Breakpoint.expects(:activate_drb)
+    @handler.expects(:breakpoint)
+    @handler.expects(:dispatcher_log).with(:info, "breakpointing")
+    @handler.send(:breakpoint!)
+    assert_nil @handler.when_ready
+  end
+  
-  def test_uninterrupted_processing
-    @handler.process!
@@ -61 +155 @@
-
-  def test_interrupted_via_HUP_when_not_in_request
+    @handler.expects(:reload!)
-    FCGI.time_to_sleep = 1
-    @handler.thread = Thread.new { @handler.process! }
@@ -68 +163 @@
-    assert_nil @handler.exit_code
-    assert_equal :reload, @handler.when_ready
-    assert @handler.reloaded
-  end
-
-  def test_interrupted_via_HUP_when_in_request
+    @handler.expects(:reload!)
+    
-    Dispatcher.time_to_sleep = 1
-    @handler.thread = Thread.new { @handler.process! }
@@ -79 +175 @@
-    assert_nil @handler.exit_code
-    assert_equal :reload, @handler.when_ready
-    assert @handler.reloaded
-  end
-