mirror of
https://github.com/github/rails.git
synced 2026-01-26 23:08:58 -05:00
Don't reap spawn-fcgi. Closes #2727.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2865 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
@@ -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]
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user