summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2007-12-21 17:55:16 -0600
committerLuke Kanies <luke@madstop.com>2007-12-21 17:55:16 -0600
commite2fc425010c20e307c835a726b74f19abf31ba34 (patch)
tree08f6336cd143c4315de52d32b27dbf54cc2b3188 /lib/puppet
parentc59ff622a33b82f413207a146edd4ff6e011e729 (diff)
downloadpuppet-e2fc425010c20e307c835a726b74f19abf31ba34.tar.gz
puppet-e2fc425010c20e307c835a726b74f19abf31ba34.tar.xz
puppet-e2fc425010c20e307c835a726b74f19abf31ba34.zip
Attempting to fix #952 -- catching any exceptions thrown
during a run.
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/network/client.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/puppet/network/client.rb b/lib/puppet/network/client.rb
index 9a861fdf2..d1738bd21 100644
--- a/lib/puppet/network/client.rb
+++ b/lib/puppet/network/client.rb
@@ -175,8 +175,11 @@ class Puppet::Network::Client
:tolerance => 1,
:start? => true
) do
- if self.scheduled?
- self.runnow
+ begin
+ self.runnow if self.scheduled?
+ rescue => detail
+ puts detail.backtrace if Puppet[:trace]
+ Puppet.err "Could not run client: %s" % detail
end
end