diff options
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/commands/process/reaper.rb | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index ff1138f412..0c651eb869 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *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] diff --git a/railties/lib/commands/process/reaper.rb b/railties/lib/commands/process/reaper.rb index d1aeee308f..6da2191d1b 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 =~ /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 @@ class ProgramProcess private def process_lines_with_keyword(keyword) - `ps -axww -o 'pid command' | grep #{keyword}` + `ps axww -o 'pid command' | grep #{keyword}` end end |