summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/puppetd1
-rw-r--r--lib/puppet/storage.rb3
2 files changed, 3 insertions, 1 deletions
diff --git a/bin/puppetd b/bin/puppetd
index f61ee69f3..fb8759057 100755
--- a/bin/puppetd
+++ b/bin/puppetd
@@ -279,6 +279,7 @@ end
client.setcerts
trap(:INT) {
+ Puppet.notice "Caught INT; shutting down"
client.shutdown
}
diff --git a/lib/puppet/storage.rb b/lib/puppet/storage.rb
index 59fe4a1fc..959d12c32 100644
--- a/lib/puppet/storage.rb
+++ b/lib/puppet/storage.rb
@@ -78,7 +78,7 @@ module Puppet
end
def self.store
- #Puppet.debug "Storing state"
+ Puppet.debug "Storing state"
unless FileTest.directory?(File.dirname(Puppet[:statefile]))
begin
Puppet.recmkdir(File.dirname(Puppet[:statefile]))
@@ -97,6 +97,7 @@ module Puppet
Puppet::Util.writelock(Puppet[:statefile], 0600) do |file|
file.print YAML.dump(@@state)
end
+ Puppet.debug "Stored state"
end
end
end