diff options
Diffstat (limited to 'lib')
| -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 |