summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-04-08 23:48:48 -0500
committerLuke Kanies <luke@madstop.com>2008-04-08 23:48:48 -0500
commitd420701522990dd7c55bda7ea1e070254e9dcd13 (patch)
treea34b47da6b5b78560cc4cd467047cfe34a798b01
parentd82ac984cdbafb9fd43b2566b911b3ba33c0e38c (diff)
downloadpuppet-d420701522990dd7c55bda7ea1e070254e9dcd13.tar.gz
puppet-d420701522990dd7c55bda7ea1e070254e9dcd13.tar.xz
puppet-d420701522990dd7c55bda7ea1e070254e9dcd13.zip
Making the log messages around caching better.
-rw-r--r--lib/puppet/indirector/indirection.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/puppet/indirector/indirection.rb b/lib/puppet/indirector/indirection.rb
index 56cd687af..536735c21 100644
--- a/lib/puppet/indirector/indirection.rb
+++ b/lib/puppet/indirector/indirection.rb
@@ -178,9 +178,9 @@ class Puppet::Indirector::Indirection
# See if our instance is in the cache and up to date.
if cache? and cached = cache.find(request)
if cached.expired?
- Puppet.info "Cached %s %s expired at %s; not using" % [self.name, request.key, cached.expiration]
+ 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 %s" % [self.name, request.key]
+ Puppet.debug "Using cached %s for %s" % [self.name, request.key]
return cached
end
end
@@ -189,7 +189,7 @@ class Puppet::Indirector::Indirection
if result = terminus.find(request)
result.expiration ||= self.expiration
if cache?
- Puppet.info "Caching %s %s" % [self.name, request.key]
+ Puppet.info "Caching %s for %s" % [self.name, request.key]
cached_request = request.clone
cached_request.instance = result
cache.save(cached_request)