Permalink
Browse files

Make sure script/reaper only reaps dispatcher pids by default, and no…

…t the spawner's pid.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4614 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 101ebc9 commit fcd489b4c2bcf766fb25ca6d09224b15dfe75454 @jamis jamis committed Jul 18, 2006
Showing with 4 additions and 2 deletions.
  1. +2 −0 railties/CHANGELOG
  2. +2 −2 railties/lib/commands/process/reaper.rb
View
@@ -1,5 +1,7 @@
*SVN*
+* Make sure script/reaper only reaps dispatcher pids by default, and not the spawner's pid. [Jamis Buck]
+
* Fix script/plugin about so it uses about.yml and not meta.yml. [James Adam]
* Dispatcher processes rescued actions with the same controller that processed the request. #4625 [sd@notso.net]
@@ -86,7 +86,7 @@ def pid_files
OPTIONS = {
:action => "restart",
:pid_path => File.expand_path(RAILS_ROOT + '/tmp/pids'),
- :pattern => "dispatch.*.pid"
+ :pattern => "dispatch.[0-9]*.pid"
}
ARGV.options do |opts|
@@ -132,4 +132,4 @@ def pid_files
opts.parse!
end
-Killer.process(OPTIONS[:action], OPTIONS[:pid_path], OPTIONS[:pattern])
+Killer.process(OPTIONS[:action], OPTIONS[:pid_path], OPTIONS[:pattern])

0 comments on commit fcd489b

Please sign in to comment.