summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-04-20 15:59:57 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-04-20 15:59:57 +0000
commite1b04448be2af1865722dda2b22e4e0f95c31074 (patch)
tree79d9b35ca2ea2c350943bcd582a5e963dffdb13a /lib
parent37ffb636f1cdc108097fa65723140ee9de8b12dc (diff)
downloadpuppet-e1b04448be2af1865722dda2b22e4e0f95c31074.tar.gz
puppet-e1b04448be2af1865722dda2b22e4e0f95c31074.tar.xz
puppet-e1b04448be2af1865722dda2b22e4e0f95c31074.zip
Fixing #591 -- puppetd now correctly restarts itself when it receives a HUP
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2402 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet.rb b/lib/puppet.rb
index cabf85bd2..f1b080b35 100644
--- a/lib/puppet.rb
+++ b/lib/puppet.rb
@@ -204,7 +204,7 @@ module Puppet
# Handle restarting.
trap(:HUP) do
- if client = @services.find { |s| s.is_a? Puppet::Network::Client::MasterClient } and client.running?
+ if client = @services.find { |s| s.is_a? Puppet::Network::Client::Master } and client.running?
client.restart
else
Puppet.restart