diff options
author | Matt Robinson <matt@puppetlabs.com> | 2010-06-23 16:33:45 -0700 |
---|---|---|
committer | James Turnbull <james@lovedthanlost.net> | 2010-06-27 03:50:50 +1000 |
commit | db39b7c0848f8931989cbe21ff202552c0ae78c1 (patch) | |
tree | fe49157c45e6fd5e5666821920cac60b8a961fe4 /lib/puppet/rails/rails_resource.rb | |
parent | 428683917e4819e294f65511932eb1c9067d8cb8 (diff) | |
download | puppet-db39b7c0848f8931989cbe21ff202552c0ae78c1.tar.gz puppet-db39b7c0848f8931989cbe21ff202552c0ae78c1.tar.xz puppet-db39b7c0848f8931989cbe21ff202552c0ae78c1.zip |
[#4026] When --use_cached_catalog is specified on a puppetd run actully use the cache
Running puppetd with --use_cached_catalog you would see messages like:
info: Not using expired catalog for mattmac.local from cache
notice: Using cached catalog
Both Puppet::Util::Cacher, which extends catalogs, and Puppet::Indirector::Envelope,
which extends all Indirection objects including catalogs, have their own cache
expiring mechanisms. The Envelope mechanism was declining to use cached
catalogs without taking into account what the --use_cached_catalog
options said. This patch fixes so it uses the cached catalog and just logs:
debug: Using cached catalog for mattmac.local
This commit also renames a method that makes requests from request
to instantiate request, and gets rid of the extender hook on Cacher
since it was only being used on one test and probably shouldn't be used
in general.
Reviewed by: Nick Lewis
Diffstat (limited to 'lib/puppet/rails/rails_resource.rb')
0 files changed, 0 insertions, 0 deletions