diff options
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/commands/servers/lighttpd.rb | 14 |
2 files changed, 14 insertions, 2 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 09961301c7..9c5073ae1f 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Reap FCGI processes after lighttpd exits. [Sam Stephenson] + * Update to script.aculo.us to 1.5.0 rev. 3343 [Thomas Fuchs] * Honor ActiveRecord::Base.pluralize_table_names when creating and destroying session store table. #3204. [rails@bencurtis.com, Marcel Molina Jr.] diff --git a/railties/lib/commands/servers/lighttpd.rb b/railties/lib/commands/servers/lighttpd.rb index 8f67721a04..7d2682cb97 100644 --- a/railties/lib/commands/servers/lighttpd.rb +++ b/railties/lib/commands/servers/lighttpd.rb @@ -1,3 +1,5 @@ +require 'rbconfig' + unless RUBY_PLATFORM !~ /mswin/ && !silence_stderr { `lighttpd -version` }.blank? puts "PROBLEM: Lighttpd is not available on your system (or not in your path)" exit 1 @@ -56,5 +58,13 @@ else end trap(:INT) { exit } -`lighttpd #{!detach ? "-D " : ""}-f #{config_file}` -tail_thread.kill if tail_thread + +begin + `lighttpd #{!detach ? "-D " : ""}-f #{config_file}` +ensure + tail_thread.kill if tail_thread + + # Ensure FCGI processes are reaped + path_to_ruby = "#{Config::CONFIG['bindir']}/#{Config::CONFIG['ruby_install_name']}" + `#{path_to_ruby} #{RAILS_ROOT}/script/process/reaper -a kill` +end |