diff options
Diffstat (limited to 'lib/puppet/server')
| -rwxr-xr-x | lib/puppet/server/fileserver.rb | 7 | ||||
| -rw-r--r-- | lib/puppet/server/master.rb | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/lib/puppet/server/fileserver.rb b/lib/puppet/server/fileserver.rb index d25185476..4deeea46c 100755 --- a/lib/puppet/server/fileserver.rb +++ b/lib/puppet/server/fileserver.rb @@ -182,14 +182,17 @@ class Server return if @noreadconfig if @configstamp and FileTest.exists?(@config) - if @configtimeout and @configstatted and - (Time.now - @configstatted > @configtimeout) + if @configtimeout and @configstatted + if Time.now - @configstatted > @configtimeout @configstatted = Time.now tmp = File.stat(@config).ctime if tmp == @configstamp return end + else + return + end end end diff --git a/lib/puppet/server/master.rb b/lib/puppet/server/master.rb index dd16c788d..5f3700978 100644 --- a/lib/puppet/server/master.rb +++ b/lib/puppet/server/master.rb @@ -91,8 +91,8 @@ class Server def parsefile if @filestamp and FileTest.exists?(@file) - if @filetimeout and @filestatted and - (Time.now - @filestatted > @filetimeout) + if @filetimeout and @filestatted + if Time.now - @filestatted > @filetimeout tmp = File.stat(@file).ctime @filestatted = Time.now @@ -101,6 +101,9 @@ class Server else Puppet.notice "Reloading file" end + else + return + end end end |