diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-07-08 22:48:08 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-07-08 22:48:08 +0000 |
| commit | e8217abac6638d73d742c3ecfb1c9792b3ef0803 (patch) | |
| tree | f08ac7be3aeb6753406e1ef07aefba1726e428e4 /lib/puppet | |
| parent | 60e5e10ef51f9eed05e7fbeff6866668311de181 (diff) | |
| download | puppet-e8217abac6638d73d742c3ecfb1c9792b3ef0803.tar.gz puppet-e8217abac6638d73d742c3ecfb1c9792b3ef0803.tar.xz puppet-e8217abac6638d73d742c3ecfb1c9792b3ef0803.zip | |
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
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/network/client/master.rb | 8 |
1 files changed, 6 insertions, 2 deletions
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 |