diff options
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rwxr-xr-x | railties/bin/process/reaper | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 37fca392df..5b025f498f 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Added -w flag to ps in process/reaper #1934 [Scott Barron] + * Add integration with SwitchTower (rake tasks, default deploy.rb recipe) * Allow ERb in the database.yml file (just like with fixtures), so you can pull out the database configuration in environment variables #1822 [Duane Johnson] diff --git a/railties/bin/process/reaper b/railties/bin/process/reaper index 3b58698653..409d3b3c50 100755 --- a/railties/bin/process/reaper +++ b/railties/bin/process/reaper @@ -29,7 +29,7 @@ class ProgramProcess def find_by_keyword(keyword) process_lines_with_keyword(keyword).split("\n").collect { |line| - next if line.include?("inq") || line.include?("ps -ax") || line.include?("grep") + next if line.include?("inq") || line.include?("ps -wwax") || line.include?("grep") pid, *command = line.split new(pid, command.join(" ")) }.compact @@ -37,7 +37,7 @@ class ProgramProcess private def process_lines_with_keyword(keyword) - `ps -ax -o 'pid command' | grep #{keyword}` + `ps -wwax -o 'pid command' | grep #{keyword}` end end @@ -128,4 +128,4 @@ end ProgramProcess.process_keywords("usr1", OPTIONS[:spinner]) if OPTIONS[:toggle_spin] ProgramProcess.process_keywords(OPTIONS[:action], OPTIONS[:dispatcher]) nudge(OPTIONS[:nudge], OPTIONS[:iterations]) if OPTIONS[:nudge] -ProgramProcess.process_keywords("usr1", OPTIONS[:spinner]) if OPTIONS[:toggle_spin]
\ No newline at end of file +ProgramProcess.process_keywords("usr1", OPTIONS[:spinner]) if OPTIONS[:toggle_spin] |