aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/commands/process/reaper.rb
diff options
context:
space:
mode:
authorJamis Buck <jamis@37signals.com>2006-07-18 17:48:06 +0000
committerJamis Buck <jamis@37signals.com>2006-07-18 17:48:06 +0000
commitfcd489b4c2bcf766fb25ca6d09224b15dfe75454 (patch)
tree6d0c5e248efc2541c084bd9a464898e351d96eed /railties/lib/commands/process/reaper.rb
parent101ebc996a241fab4adcbbaf6c8930dddde8d091 (diff)
downloadrails-fcd489b4c2bcf766fb25ca6d09224b15dfe75454.tar.gz
rails-fcd489b4c2bcf766fb25ca6d09224b15dfe75454.tar.bz2
rails-fcd489b4c2bcf766fb25ca6d09224b15dfe75454.zip
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
Diffstat (limited to 'railties/lib/commands/process/reaper.rb')
-rw-r--r--railties/lib/commands/process/reaper.rb4
1 files changed, 2 insertions, 2 deletions
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])