summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan DeLeo <dan@kallistec.com>2017-04-10 14:35:14 -0700
committerGitHub <noreply@github.com>2017-04-10 14:35:14 -0700
commit3e5f1f38cb225c62b1f0cce9151c557ab9dc1739 (patch)
tree96bd4d8ea431ecf96e1feb8c2d24ed5af1fcbf96
parentb29b391540624156f10da9d8b5487b3e9b0bc5eb (diff)
parent08fbff8cac3af16abc3d5fc344603218792dc370 (diff)
downloadchef-3e5f1f38cb225c62b1f0cce9151c557ab9dc1739.tar.gz
Merge pull request #6042 from chef/dan/tame-required-recipe-messaging
Clarify log messaging for required recipe feature
-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 06325e0a23..9f8a34e85e 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 064876a82f..d348c24385 100644
--- a/spec/unit/client_spec.rb
+++ b/spec/unit/client_spec.rb
@@ -437,7 +437,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