diff options
| author | Nick Lewis <nick@puppetlabs.com> | 2011-07-21 11:36:03 -0700 |
|---|---|---|
| committer | Jacob Helwig <jacob@puppetlabs.com> | 2011-08-19 13:52:55 -0700 |
| commit | 8d530906490d5e2fafadd60a7f1699ef1d37b211 (patch) | |
| tree | 20153bc73cb60fe6d3020d328a74bb9f35710e80 /lib/puppet/indirector | |
| parent | 3093047e07bdc69222c26d11aff50353f64c977d (diff) | |
| download | puppet-8d530906490d5e2fafadd60a7f1699ef1d37b211.tar.gz puppet-8d530906490d5e2fafadd60a7f1699ef1d37b211.tar.xz puppet-8d530906490d5e2fafadd60a7f1699ef1d37b211.zip | |
Remove use of Util::Cacher in FileServing::Configuration
This class was using Util::Cacher for its singleton instance, when that was
unnecessary. The FileServing::Configuration instance already manages whether or
not to reparse its config file, based on whether it has changed. Thus, there is
no need for it to be manually expired via the cacher.
Reviewed-By: Jacob Helwig <jacob@puppetlabs.com>
(cherry picked from commit 4bad729f56c26d8154cd0f20614fa4e478de9d40)
Diffstat (limited to 'lib/puppet/indirector')
| -rw-r--r-- | lib/puppet/indirector/file_server.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/indirector/file_server.rb b/lib/puppet/indirector/file_server.rb index a1a5c0a44..9516a404c 100644 --- a/lib/puppet/indirector/file_server.rb +++ b/lib/puppet/indirector/file_server.rb @@ -60,6 +60,6 @@ class Puppet::Indirector::FileServer < Puppet::Indirector::Terminus # Our fileserver configuration, if needed. def configuration - Puppet::FileServing::Configuration.create + Puppet::FileServing::Configuration.configuration end end |