diff options
author | Nick Lewis <nick@puppetlabs.com> | 2011-07-21 11:40:00 -0700 |
---|---|---|
committer | Jacob Helwig <jacob@puppetlabs.com> | 2011-08-19 13:52:56 -0700 |
commit | 546e0f98e3c6bfcb35163d1c6c19e0b4cb02e230 (patch) | |
tree | 983d9a9a29322d412864eb43bfca0ca345d11dd3 /lib | |
parent | b6b54981bb0972ed6e57d5763e976418fe5bd32b (diff) | |
download | puppet-546e0f98e3c6bfcb35163d1c6c19e0b4cb02e230.tar.gz puppet-546e0f98e3c6bfcb35163d1c6c19e0b4cb02e230.tar.xz puppet-546e0f98e3c6bfcb35163d1c6c19e0b4cb02e230.zip |
Remove Puppet::Util::Cacher usage from Puppet::Util::Settings
The path attribute was being unnecessarily cached. The value is a LoadedFile
instance, which already knows how to check whether it needs to be reloaded. The
act of reparsing was being triggered separately from the cacher mechanism.
The comment indicated this value was only being cached so it could be easily
cleared for tests, but it wasn't being cleared for tests. Thus, there is no
reason for this attribute to be cached, so remove it.
Reviewed-By: Jacob Helwig <jacob@puppetlabs.com>
(cherry picked from commit bdcb9be3b5d7cd54548cbeb7b13bee6fe4e730f7)
Diffstat (limited to 'lib')
-rw-r--r-- | lib/puppet/util/settings.rb | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb index 4559e9af3..caaf61b7b 100644 --- a/lib/puppet/util/settings.rb +++ b/lib/puppet/util/settings.rb @@ -2,13 +2,11 @@ require 'puppet' require 'sync' require 'getoptlong' require 'puppet/external/event-loop' -require 'puppet/util/cacher' require 'puppet/util/loadedfile' # The class for handling configuration files. class Puppet::Util::Settings include Enumerable - include Puppet::Util::Cacher require 'puppet/util/settings/setting' require 'puppet/util/settings/file_setting' @@ -401,11 +399,10 @@ class Puppet::Util::Settings } end - # Cache this in an easily clearable way, since we were - # having trouble cleaning it up after tests. - cached_attr(:file) do + def file + return @file if @file if path = self[:config] and FileTest.exist?(path) - Puppet::Util::LoadedFile.new(path) + @file = Puppet::Util::LoadedFile.new(path) end end |