TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Make sure script/reaper only reaps dispatcher pids by default, and not the spawner's pid.

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4614 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Jamis Buck 2006-07-18 17:48:06 +00:00
parent 101ebc996a
commit fcd489b4c2
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
railties/CHANGELOG
View File

@ -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]

4
railties/lib/commands/process/reaper.rb
View File

@ -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])