diff options
| author | David Schmitt <david@dasz.at> | 2010-05-14 13:12:41 +0200 |
|---|---|---|
| committer | test branch <puppet-dev@googlegroups.com> | 2010-02-17 06:50:53 -0800 |
| commit | c59d864ecdf5a1a7c9075c6dd40faea0d15ebc36 (patch) | |
| tree | 31ca7f5dd58348f444b8ce2d5f987a5e9ed1a08c /lib/puppet | |
| parent | bbba9f9f52b71c0402a297b3d738aee0cc75b348 (diff) | |
| download | puppet-c59d864ecdf5a1a7c9075c6dd40faea0d15ebc36.tar.gz puppet-c59d864ecdf5a1a7c9075c6dd40faea0d15ebc36.tar.xz puppet-c59d864ecdf5a1a7c9075c6dd40faea0d15ebc36.zip | |
Avoid non-win32 signals on win32 runtime
Diffstat (limited to 'lib/puppet')
| -rwxr-xr-x | lib/puppet/daemon.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/puppet/daemon.rb b/lib/puppet/daemon.rb index b6dbf2665..a8c0495ba 100755 --- a/lib/puppet/daemon.rb +++ b/lib/puppet/daemon.rb @@ -95,7 +95,10 @@ class Puppet::Daemon # Trap a couple of the main signals. This should probably be handled # in a way that anyone else can register callbacks for traps, but, eh. def set_signal_traps - {:INT => :stop, :TERM => :stop, :HUP => :restart, :USR1 => :reload, :USR2 => :reopen_logs}.each do |signal, method| + signals = {:INT => :stop, :TERM => :stop } + # extended signals not supported under windows + signals.update({:HUP => :restart, :USR1 => :reload, :USR2 => :reopen_logs }) unless Puppet.features.win32? + signals.each do |signal, method| trap(signal) do Puppet.notice "Caught #{signal}; calling #{method}" send(method) |