diff options
Diffstat (limited to 'lib/puppet/server/master.rb')
| -rw-r--r-- | lib/puppet/server/master.rb | 7 |
1 files changed, 5 insertions, 2 deletions
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 |