summaryrefslogtreecommitdiffstats
path: root/lib/puppet/client
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet/client')
-rw-r--r--lib/puppet/client/master.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/puppet/client/master.rb b/lib/puppet/client/master.rb
index 999938284..c56946650 100644
--- a/lib/puppet/client/master.rb
+++ b/lib/puppet/client/master.rb
@@ -2,7 +2,9 @@
require 'sync'
class Puppet::Client::MasterClient < Puppet::Client
- @@sync = Sync.new
+ unless defined? @@sync
+ @@sync = Sync.new
+ end
Puppet.setdefaults("puppetd",
:puppetdlockfile => [ "$statedir/puppetdlock",