Reap FCGI processes after lighttpd exits

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3398 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Sam Stephenson
2006-01-12 23:57:44 +00:00
parent 751b6be464
commit 7fbfc5ab61
2 changed files with 14 additions and 2 deletions

View File

@@ -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.]

View File

@@ -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