mirror of
https://github.com/github/rails.git
synced 2026-02-06 20:25:28 -05:00
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:
@@ -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.]
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user