From 7fbfc5ab61de3ac36d71a6501e9d2ca51e6b9d83 Mon Sep 17 00:00:00 2001
From: Sam Stephenson <sam@37signals.com>
Date: Thu, 12 Jan 2006 23:57:44 +0000
Subject: Reap FCGI processes after lighttpd exits

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3398 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 railties/lib/commands/servers/lighttpd.rb | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'railties/lib/commands/servers')

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
-- 
cgit v1.2.3