diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2005-11-02 22:05:45 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2005-11-02 22:05:45 +0000 |
| commit | 26311f6cd09bb390f878b23a233679b874411208 (patch) | |
| tree | a7e85f9bd8a457a612fda7d5d89c3b90c85d3229 /railties | |
| parent | aabf9093a09a825d776b83f7fec6473ad8b75cca (diff) | |
| download | rails-26311f6cd09bb390f878b23a233679b874411208.tar.gz rails-26311f6cd09bb390f878b23a233679b874411208.tar.bz2 rails-26311f6cd09bb390f878b23a233679b874411208.zip | |
Reaper knows how to find processes even if the dispatch path is very long. Closes #2711.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2851 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/commands/process/reaper.rb | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 25a59b2734..b1218b3245 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* 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] * Added demonstration of fixture use to the test case generated by the model generator [DHH] diff --git a/railties/lib/commands/process/reaper.rb b/railties/lib/commands/process/reaper.rb index b99fd1efa2..0064642d6a 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 -ax") || line.include?("grep") + next if line.include?("inq") || line.include?("ps -axww") || line.include?("grep") pid, *command = line.split new(pid, command.join(" ")) }.compact @@ -40,7 +40,7 @@ class ProgramProcess private def process_lines_with_keyword(keyword) - `ps -ax -o 'pid command' | grep #{keyword}` + `ps -axww -o 'pid command' | grep #{keyword}` end end @@ -127,4 +127,4 @@ ARGV.options do |opts| opts.parse! end -ProgramProcess.process_keywords(OPTIONS[:action], OPTIONS[:dispatcher])
\ No newline at end of file +ProgramProcess.process_keywords(OPTIONS[:action], OPTIONS[:dispatcher]) |