diff options
| -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 |