From e8217abac6638d73d742c3ecfb1c9792b3ef0803 Mon Sep 17 00:00:00 2001 From: luke Date: Sun, 8 Jul 2007 22:48:08 +0000 Subject: Hopefully fixing #685 -- I added a wrapper around the call to getconfig(), so any timeouts will just throw an error and skip the run, rather than failing and killing the daemon. This is not the best approach, since really, each method should be wrapped, but it is sufficient. git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2658 980ebf18-57e1-0310-9a29-db15c13687c0 --- lib/puppet/network/client/master.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'lib/puppet') diff --git a/lib/puppet/network/client/master.rb b/lib/puppet/network/client/master.rb index ae13f8185..8d141f33f 100644 --- a/lib/puppet/network/client/master.rb +++ b/lib/puppet/network/client/master.rb @@ -300,8 +300,12 @@ class Puppet::Network::Client::Master < Puppet::Network::Client lockfile.lockfile else got_lock = true - @configtime = thinmark do - self.getconfig + begin + @configtime = thinmark do + self.getconfig + end + rescue => detail + Puppet.err "Could not retrieve configuration: %s" % detail end if defined? @objects and @objects -- cgit