Using Puppet.settraps in puppet executable, instead of old ad-hoc code.

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

1 files changed, 1 insertions, 10 deletions

diff --git a/bin/puppet b/bin/puppet
index 8a91769d9..ee60415d5 100755
--- a/bin/puppet
+++ b/bin/puppet
@@ -139,16 +139,7 @@ end
 client = nil
 server = nil
 
-[:INT, :TERM].each do |signal|
-    trap(signal) do
-        Puppet.notice "Caught #{signal}; shutting down"
-        [client, server].each { |obj|
-            if obj
-                obj.shutdown
-            end
-        }
-    end
-end
+Puppet.settraps
 
 if debug
     Puppet::Log.level = :debug