[#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

1 files changed, 0 insertions, 9 deletions

diff --git a/lib/puppet/util/cacher.rb b/lib/puppet/util/cacher.rb
index 28786ab53..3c9d24db9 100644
--- a/lib/puppet/util/cacher.rb
+++ b/lib/puppet/util/cacher.rb
@@ -18,15 +18,6 @@ module Puppet::Util::Cacher
 
     extend Expirer
 
-    # Our module has been extended in a class; we can only add the Instance methods,
-    # which become *class* methods in the class.
-    def self.extended(other)
-        class << other
-            extend ClassMethods
-            include InstanceMethods
-        end
-    end
-
     # Our module has been included in a class, which means the class gets the class methods
     # and all of its instances get the instance methods.
     def self.included(other)