diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2005-11-03 22:08:56 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2005-11-03 22:08:56 +0000 |
| commit | f482bd50186b8cd9150eb370b0d274446aecef2b (patch) | |
| tree | 0f9c7bc4677a71f1634332d8e9342b25ce66065d /railties | |
| parent | 189b7907d5af46c61f19e0eaacb2a30ec1bc16dd (diff) | |
| download | rails-f482bd50186b8cd9150eb370b0d274446aecef2b.tar.gz rails-f482bd50186b8cd9150eb370b0d274446aecef2b.tar.bz2 rails-f482bd50186b8cd9150eb370b0d274446aecef2b.zip | |
Don't reap spawn-fcgi. Closes #2727.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2865 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/commands/process/reaper.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index b1218b3245..d4f929e60c 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Don't reap spawn-fcgi. #2727 [matthew@walker.wattle.id.au] + * Reaper knows how to find processes even if the dispatch path is very long. #2711 [matthew@walker.wattle.id.au] * Make fcgi handler respond to TERM signals with an explicit exit [Jamis Buck] diff --git a/railties/lib/commands/process/reaper.rb b/railties/lib/commands/process/reaper.rb index 0064642d6a..1d74785911 100644 --- a/railties/lib/commands/process/reaper.rb +++ b/railties/lib/commands/process/reaper.rb @@ -32,7 +32,7 @@ class ProgramProcess # ProgramProcess.find_by_keyword("basecamp") def find_by_keyword(keyword) process_lines_with_keyword(keyword).split("\n").collect { |line| - next if line.include?("inq") || line.include?("ps -axww") || line.include?("grep") + next if line =~ /inq|ps -axww|grep|spawn-fcgi/ pid, *command = line.split new(pid, command.join(" ")) }.compact |