summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--examples/config/cookbooks/fakefile/attributes/first.rb2
-rw-r--r--examples/config/cookbooks/fakefile/recipes/default.rb1
-rw-r--r--lib/chef/client.rb4
-rw-r--r--lib/chef/runner.rb4
4 files changed, 6 insertions, 5 deletions
diff --git a/examples/config/cookbooks/fakefile/attributes/first.rb b/examples/config/cookbooks/fakefile/attributes/first.rb
index e34a60b280..927dafe967 100644
--- a/examples/config/cookbooks/fakefile/attributes/first.rb
+++ b/examples/config/cookbooks/fakefile/attributes/first.rb
@@ -1,2 +1,2 @@
Chef::Log.debug("You are the first of fakefile's attributes")
-friends("you said we wuz visiting em") \ No newline at end of file
+friends("you said we wuz visiting em") \ No newline at end of file
diff --git a/examples/config/cookbooks/fakefile/recipes/default.rb b/examples/config/cookbooks/fakefile/recipes/default.rb
index 2b8c043646..8ec1bc6b02 100644
--- a/examples/config/cookbooks/fakefile/recipes/default.rb
+++ b/examples/config/cookbooks/fakefile/recipes/default.rb
@@ -81,6 +81,7 @@ template "/tmp/foo-template" do
:stripes => "are the best",
:at => "the sleazy rock thing"
},
+ :all_servers => search(:nodes, "*")
})
end
diff --git a/lib/chef/client.rb b/lib/chef/client.rb
index ace031fb5e..c8ab31eed7 100644
--- a/lib/chef/client.rb
+++ b/lib/chef/client.rb
@@ -175,7 +175,7 @@ class Chef
end
if changed
- Chef::Log.debug("Storing updated #{cache_file}")
+ Chef::Log.info("Storing updated #{cache_file} in the cache.")
Chef::FileCache.move_to(raw_file.path, cache_file)
end
end
@@ -183,7 +183,7 @@ class Chef
Chef::FileCache.list.each do |cache_file|
if cache_file.match("cookbooks/.+?/#{segment}")
unless file_canonical[cache_file]
- Chef::Log.info("Removing #{cache_file}, as it is no longer a valid.")
+ Chef::Log.info("Removing #{cache_file} from the cache; it is no longer on the server.")
Chef::FileCache.delete(cache_file)
end
end
diff --git a/lib/chef/runner.rb b/lib/chef/runner.rb
index 15347fcfa1..cde844f027 100644
--- a/lib/chef/runner.rb
+++ b/lib/chef/runner.rb
@@ -68,14 +68,14 @@ class Chef
resource.actions.each_key do |action|
if resource.actions[action].has_key?(:immediate)
resource.actions[action][:immediate].each do |r|
- Chef::Log.info("#{resource} sending action #{action} to #{r} (immediate)")
+ Chef::Log.info("#{resource} sending #{action} action to #{r} (immediate)")
build_provider(r).send("action_#{action}")
end
end
if resource.actions[action].has_key?(:delayed)
resource.actions[action][:delayed].each do |r|
delayed_actions << lambda {
- Chef::Log.info("#{resource} sending action #{action} to #{r} (delayed)")
+ Chef::Log.info("#{resource} sending #{action} action to #{r} (delayed)")
build_provider(r).send("action_#{action}")
}
end