Signed-off-by: Luke Kanies <[email protected]>
---
lib/puppet/configurer.rb | 1 +
spec/unit/configurer.rb | 4 +++-
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/lib/puppet/configurer.rb b/lib/puppet/configurer.rb
index d9f2071..7db9972 100644
--- a/lib/puppet/configurer.rb
+++ b/lib/puppet/configurer.rb
@@ -103,6 +103,7 @@ class Puppet::Configurer
duration = thinmark do
result = catalog_class.find(name,
fact_options.merge(:ignore_terminus => true))
end
+ Puppet.notice "Using cached catalog"
rescue => detail
puts detail.backtrace if Puppet[:trace]
Puppet.err "Could not retrieve catalog from cache: %s" % detail
diff --git a/spec/unit/configurer.rb b/spec/unit/configurer.rb
index fcc124d..c27445a 100755
--- a/spec/unit/configurer.rb
+++ b/spec/unit/configurer.rb
@@ -105,10 +105,12 @@ describe Puppet::Configurer, "when retrieving a catalog"
do
@agent.retrieve_catalog.should == @catalog
end
- it "should return the cached catalog when no catalog can be retrieved from
the server" do
+ it "should log and return the cached catalog when no catalog can be
retrieved from the server" do
Puppet::Resource::Catalog.expects(:find).with { |name, options|
options[:ignore_cache] == true }.returns nil
Puppet::Resource::Catalog.expects(:find).with { |name, options|
options[:ignore_terminus] == true }.returns @catalog
+ Puppet.expects(:notice)
+
@agent.retrieve_catalog.should == @catalog
end
--
1.6.1
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Puppet Developers" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/puppet-dev?hl=en
-~----------~----~----~----~------~----~------~--~---
