Made lots of small changes, mostly to help usability but also fixed a couple of key bugs

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@841 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 8 insertions, 0 deletions

diff --git a/bin/puppetd b/bin/puppetd
index bb0789c21..1b772213b 100755
--- a/bin/puppetd
+++ b/bin/puppetd
@@ -205,6 +205,7 @@ if centrallogs
 end
 
 
+Puppet.info "Starting Puppet client version %s" % [Puppet.version]
 client = Puppet::Client::MasterClient.new(args)
 
 
@@ -234,12 +235,19 @@ end
 # now set up the network client with the certs, now that we have them
 client.setcerts
 
+trap(:INT) {
+    exit(1)
+}
+
 # and then retrieve and apply our configuration
 begin
     client.getconfig
     client.apply
 rescue => detail
     Puppet.err detail.to_s
+    if Puppet[:debug]
+        puts detail.backtrace
+    end
     exit(13)
 end