summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordanielsdeleo <dan@chef.io>2017-04-10 13:01:14 -0700
committerdanielsdeleo <dan@chef.io>2017-04-10 14:36:44 -0700
commitf406d164b979bd21def6ad9dba3cba851bf54ec9 (patch)
treec0d386ba1f2cd066babd6ca03b373cee7f7a90dc
parent4b87ea73692e31b9922e449b2a6e5ab3a3820ab6 (diff)
downloadchef-required-recipe-backport.tar.gz
Clarify log messaging for required recipe featurerequired-recipe-backport
The previous log message didn't have enough context and could sound "scary" to users unfamiliar with the feature. Signed-off-by: Daniel DeLeo <dan@chef.io>
-rw-r--r--lib/chef/client.rb3
-rw-r--r--spec/unit/client_spec.rb2
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/chef/client.rb b/lib/chef/client.rb
index 5bd79beac4..82abd34ff1 100644
--- a/lib/chef/client.rb
+++ b/lib/chef/client.rb
@@ -532,6 +532,7 @@ class Chef
#
def load_required_recipe(rest, run_context)
required_recipe_contents = rest.get("required_recipe")
+ Chef::Log.info("Required Recipe found, loading it")
Chef::FileCache.store("required_recipe", required_recipe_contents)
required_recipe_file = Chef::FileCache.load("required_recipe", false)
@@ -552,7 +553,7 @@ class Chef
rescue Net::HTTPServerException => e
case e.response
when Net::HTTPNotFound
- Chef::Log.info("Required Recipe not found")
+ Chef::Log.debug("Required Recipe not configured on the server, skipping it")
else
raise
end
diff --git a/spec/unit/client_spec.rb b/spec/unit/client_spec.rb
index 275f5cbbfc..ba71b3b6a4 100644
--- a/spec/unit/client_spec.rb
+++ b/spec/unit/client_spec.rb
@@ -445,7 +445,7 @@ EOM
end
it "should log and continue on" do
- expect(Chef::Log).to receive(:info)
+ expect(Chef::Log).to receive(:debug)
client.load_required_recipe(rest, run_context)
end
end