summaryrefslogtreecommitdiffstats
path: root/lib/puppet/parser/interpreter.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet/parser/interpreter.rb')
-rw-r--r--lib/puppet/parser/interpreter.rb15
1 files changed, 4 insertions, 11 deletions
diff --git a/lib/puppet/parser/interpreter.rb b/lib/puppet/parser/interpreter.rb
index 012d7a82a..246bdce5b 100644
--- a/lib/puppet/parser/interpreter.rb
+++ b/lib/puppet/parser/interpreter.rb
@@ -52,7 +52,7 @@ module Puppet
requires ActiveRecord from Ruby on Rails."]
)
- attr_accessor :ast, :filetimeout
+ attr_accessor :ast
class << self
attr_writer :ldap
@@ -88,7 +88,6 @@ module Puppet
elsif ! @file = hash[:Manifest]
raise Puppet::DevError, "You must provide code or a manifest"
end
- @filetimeout = hash[:ParseCheck] || 15
@lastchecked = 0
@@ -388,15 +387,9 @@ module Puppet
# Check if the parser should reparse.
if @file
if defined? @parser
- # Only check the files every 15 seconds or so, not on
- # every single connection
- if (Time.now - @lastchecked).to_i >= @filetimeout.to_i
- unless @parser.reparse?
- @lastchecked = Time.now
- return false
- end
- else
- return
+ unless @parser.reparse?
+ @lastchecked = Time.now
+ return false
end
end