Make sure script/reaper only reaps dispatcher pids by default, and not the spawner's pid.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4614 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
101ebc996a
commit
fcd489b4c2
@ -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|
|
||||
|
Loading…
Reference in New Issue
Block a user