diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-02-24 23:01:25 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-02-24 23:01:25 +0000 |
| commit | 772c7c87ffab1b7a70413fa6bbd20df45490dbf2 (patch) | |
| tree | b86f177abe4dc6526d1ac0a0c537ee9637c784ad /bin/puppetmasterd | |
| parent | 503ad38194b0064de240a1ae0f043b8fb6d40903 (diff) | |
| download | puppet-772c7c87ffab1b7a70413fa6bbd20df45490dbf2.tar.gz puppet-772c7c87ffab1b7a70413fa6bbd20df45490dbf2.tar.xz puppet-772c7c87ffab1b7a70413fa6bbd20df45490dbf2.zip | |
Adding TERM to the signals being trapped
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@945 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'bin/puppetmasterd')
| -rwxr-xr-x | bin/puppetmasterd | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/bin/puppetmasterd b/bin/puppetmasterd index 3f235b179..3ae74f73b 100755 --- a/bin/puppetmasterd +++ b/bin/puppetmasterd @@ -221,9 +221,13 @@ if args[:Daemonize] server.daemonize end -trap(:INT) { - server.shutdown -} + +[:INT, :TERM].each do |signal| + trap(signal) do + Puppet.notice "Caught #{signal}; shutting down" + server.shutdown + end +end Puppet.notice "Starting Puppet server version %s" % [Puppet.version] |