diff options
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/indirector/indirection.rb | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/lib/puppet/indirector/indirection.rb b/lib/puppet/indirector/indirection.rb index 7ac214cd0..2a54ecc24 100644 --- a/lib/puppet/indirector/indirection.rb +++ b/lib/puppet/indirector/indirection.rb @@ -185,14 +185,12 @@ class Puppet::Indirector::Indirection request = request(:find, key, *args) terminus = prepare(request) - # See if our instance is in the cache and up to date. - if cache? and ! request.ignore_cache? and cached = cache.find(request) - if cached.expired? - Puppet.info "Not using expired %s for %s from cache; expired at %s" % [self.name, request.key, cached.expiration] - else - Puppet.debug "Using cached %s for %s" % [self.name, request.key] - return cached + begin + if result = find_in_cache(request) + return result end + rescue => detail + Puppet.err "Cached %s for %s failed: %s" % [self.name, request.key, detail] end # Otherwise, return the result from the terminus, caching if appropriate. @@ -209,6 +207,18 @@ class Puppet::Indirector::Indirection return nil end + def find_in_cache(request) + # See if our instance is in the cache and up to date. + return nil unless cache? and ! request.ignore_cache? and cached = cache.find(request) + if cached.expired? + Puppet.info "Not using expired %s for %s from cache; expired at %s" % [self.name, request.key, cached.expiration] + return nil + end + + Puppet.debug "Using cached %s for %s" % [self.name, request.key] + return cached + end + # Remove something via the terminus. def destroy(key, *args) request = request(:destroy, key, *args) |