diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-07-04 19:06:50 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-07-04 19:06:50 +0000 |
| commit | 6e319ccce27d0855025eb69cb5224bd81cb41601 (patch) | |
| tree | 974908f4dd3e4b63620623de7b5a6f75ad69e16f /railties/lib | |
| parent | 5dedf62dda862d178171da68f6a3d7e5417ae1b7 (diff) | |
| download | rails-6e319ccce27d0855025eb69cb5224bd81cb41601.tar.gz rails-6e319ccce27d0855025eb69cb5224bd81cb41601.tar.bz2 rails-6e319ccce27d0855025eb69cb5224bd81cb41601.zip | |
Added an EXPERIMENTAL gateway.cgi for getting high-speed performance through vanilla CGI using a long-running, DRb-backed server in the background (using script/listener and script/tracker) #1603 [Nicholas Seckar]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1674 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/fcgi_handler.rb | 7 | ||||
| -rw-r--r-- | railties/lib/rails_generator/generators/applications/app/app_generator.rb | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/railties/lib/fcgi_handler.rb b/railties/lib/fcgi_handler.rb index f489627985..f2455b01c9 100644 --- a/railties/lib/fcgi_handler.rb +++ b/railties/lib/fcgi_handler.rb @@ -45,14 +45,14 @@ class RailsFCGIHandler dispatcher_log(:info, "starting") end - def process! + def process!(provider = FCGI) # 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| + provider.each_cgi do |cgi| # Safely reload this instance if requested. if when_ready == :reload run_gc! if gc_request_period @@ -90,7 +90,8 @@ class RailsFCGIHandler dispatcher_error(fcgi_error, "killed by this error") end end - + + private def logger @logger ||= Logger.new(@log_file_path) diff --git a/railties/lib/rails_generator/generators/applications/app/app_generator.rb b/railties/lib/rails_generator/generators/applications/app/app_generator.rb index facde24183..88089f5d16 100644 --- a/railties/lib/rails_generator/generators/applications/app/app_generator.rb +++ b/railties/lib/rails_generator/generators/applications/app/app_generator.rb @@ -43,7 +43,7 @@ class AppGenerator < Rails::Generator::Base m.file "environments/test.rb", "config/environments/test.rb" # Scripts - %w(console destroy generate server runner benchmarker profiler).each do |file| + %w(console destroy generate server runner benchmarker profiler tracker listener).each do |file| m.file "bin/#{file}", "script/#{file}", script_options end if options[:gem] @@ -56,6 +56,7 @@ class AppGenerator < Rails::Generator::Base m.file "dispatches/dispatch.rb", "public/dispatch.rb", script_options m.file "dispatches/dispatch.rb", "public/dispatch.cgi", script_options m.file "dispatches/dispatch.fcgi", "public/dispatch.fcgi", script_options + m.file "dispatches/gateway.cgi", "public/gateway.cgi", script_options # HTML files %w(404 500 index).each do |file| |