From e119b04f7738f5ffb6b9bf353bb28b3d058302a5 Mon Sep 17 00:00:00 2001 From: David Schmitt Date: Thu, 29 Apr 2010 17:32:40 +0200 Subject: Avoid setting the timeout before we know which timeout we should set. Signed-off-by: David Schmitt --- lib/puppet/util/settings.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb index b2563e996..82d2d4533 100644 --- a/lib/puppet/util/settings.rb +++ b/lib/puppet/util/settings.rb @@ -308,13 +308,13 @@ class Puppet::Util::Settings def parse raise "No :config setting defined; cannot parse unknown config file" unless self[:config] - # Create a timer so that this file will get checked automatically - # and reparsed if necessary. - set_filetimeout_timer() - @sync.synchronize do unsafe_parse(self[:config]) end + + # Create a timer so that this file will get checked automatically + # and reparsed if necessary. + set_filetimeout_timer() end # Unsafely parse the file -- this isn't thread-safe and causes plenty of problems if used directly. -- cgit