From e1b04448be2af1865722dda2b22e4e0f95c31074 Mon Sep 17 00:00:00 2001
From: luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>
Date: Fri, 20 Apr 2007 15:59:57 +0000
Subject: 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
---
 CHANGELOG     | 2 ++
 lib/puppet.rb | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index d9cbe7697..15b41b1b9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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
-- 
cgit