josh / rails fork watch download tarball
public
Fork of rails/rails
Description: Ruby on Rails
Homepage: http://rubyonrails.org
Clone URL: git://github.com/josh/rails.git 
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
jeremy (author)
Mon Nov 07 09:57:21 -0800 2005
commit  850b9c75064037621587b88724ca75df87f684a8
tree    a920e47ea7335a7faef583416dd9b1f664d306f2
parent  b49de6b74b4d96e64bf771c3c2111e68dc18dafa
0
railties/CHANGELOG 
...
1
2
 
 
3
4
5
 
...
1
2
3
4
5
6
7
 
0
@@ -1,5 +1,7 @@
0
 *SVN*
0
 
0
+* Remove bogus hyphen from script/process/reaper calls to 'ps'.  #2767 [anonymous]
0
+
0
 * Copy lighttpd.conf when it is first needed, instead of on app creation [Jamis Buck]
0
 
0
 * Use require_library_or_gem 'fcgi' in script/server [Sam Stephenson]
0
railties/lib/commands/process/reaper.rb 
...
32
33
34
35
 
36
37
38
...
40
41
42
43
 
44
45
46
 
...
32
33
34
 
35
36
37
38
...
40
41
42
 
43
44
45
46
 
0
@@ -32,7 +32,7 @@ class ProgramProcess
0
     #   ProgramProcess.find_by_keyword("basecamp")
0
     def find_by_keyword(keyword)
0
       process_lines_with_keyword(keyword).split("\n").collect { |line|
0
-        next if line =~ /inq|ps -axww|grep|spawn-fcgi|spawner|reaper/
0
+        next if line =~ /inq|ps axww|grep|spawn-fcgi|spawner|reaper/
0
         pid, *command = line.split
0
         new(pid, command.join(" "))
0
       }.compact
0
@@ -40,7 +40,7 @@ class ProgramProcess
0
 
0
     private
0
       def process_lines_with_keyword(keyword)
0
-        `ps -axww -o 'pid command' | grep #{keyword}`
0
+        `ps axww -o 'pid command' | grep #{keyword}`
0
       end
0
   end
0
 

Comments

    No one has commented yet.