From b42eaee1a7e8dd1ef7a7daad5d0b03aba6113d00 Mon Sep 17 00:00:00 2001 From: luke Date: Fri, 21 Jul 2006 23:12:51 +0000 Subject: First round of bugfixes in preparation for 0.18.4 git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1421 980ebf18-57e1-0310-9a29-db15c13687c0 --- lib/puppet/parser/interpreter.rb | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'lib/puppet/parser') 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 -- cgit