提交 850b9c75 编写于 作者: J Jeremy Kemper

Remove bogus hyphen from script/process/reaper calls to 'ps'. Closes #2767.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2922 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
上级 b49de6b7
*SVN*
* Remove bogus hyphen from script/process/reaper calls to 'ps'. #2767 [anonymous]
* Copy lighttpd.conf when it is first needed, instead of on app creation [Jamis Buck]
* Use require_library_or_gem 'fcgi' in script/server [Sam Stephenson]
......
......@@ -32,7 +32,7 @@ def process_keywords(action, *keywords)
# ProgramProcess.find_by_keyword("basecamp")
def find_by_keyword(keyword)
process_lines_with_keyword(keyword).split("\n").collect { |line|
next if line =~ /inq|ps -axww|grep|spawn-fcgi|spawner|reaper/
next if line =~ /inq|ps axww|grep|spawn-fcgi|spawner|reaper/
pid, *command = line.split
new(pid, command.join(" "))
}.compact
......@@ -40,7 +40,7 @@ def find_by_keyword(keyword)
private
def process_lines_with_keyword(keyword)
`ps -axww -o 'pid command' | grep #{keyword}`
`ps axww -o 'pid command' | grep #{keyword}`
end
end
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册