diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-04-20 15:59:57 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-04-20 15:59:57 +0000 |
| commit | e1b04448be2af1865722dda2b22e4e0f95c31074 (patch) | |
| tree | 79d9b35ca2ea2c350943bcd582a5e963dffdb13a | |
| parent | 37ffb636f1cdc108097fa65723140ee9de8b12dc (diff) | |
| download | puppet-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
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | lib/puppet.rb | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -1,3 +1,5 @@ + Puppetd once again correctly responds to HUP. + Added a syntax for referring to variables defined in other classes (e.g., $puppet::server). 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 |