From fcd489b4c2bcf766fb25ca6d09224b15dfe75454 Mon Sep 17 00:00:00 2001 From: Jamis Buck Date: Tue, 18 Jul 2006 17:48:06 +0000 Subject: 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 --- railties/CHANGELOG | 2 ++ railties/lib/commands/process/reaper.rb | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/railties/CHANGELOG b/railties/CHANGELOG index e67db7478a..f88f106015 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -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] diff --git a/railties/lib/commands/process/reaper.rb b/railties/lib/commands/process/reaper.rb index 375a78e21b..0790cfcce9 100644 --- a/railties/lib/commands/process/reaper.rb +++ b/railties/lib/commands/process/reaper.rb @@ -86,7 +86,7 @@ end 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 @@ ARGV.options do |opts| opts.parse! end -Killer.process(OPTIONS[:action], OPTIONS[:pid_path], OPTIONS[:pattern]) \ No newline at end of file +Killer.process(OPTIONS[:action], OPTIONS[:pid_path], OPTIONS[:pattern]) -- cgit v1.2.3