summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorSerdar Sutay <serdar@opscode.com>2014-10-10 15:47:34 -0700
committerSerdar Sutay <serdar@opscode.com>2014-10-10 15:47:34 -0700
commitdcd979cd994d7d9fa630343ed86d7bd9b02bbda2 (patch)
tree66ca9dc46616a5eb62807024926c030a819e74d4 /lib
parent7caff3eaa8549b72f2002199ffc19b91734e4dcd (diff)
parent0f4e1a57d4b65d35355a8c3d574b23dbb414e9e9 (diff)
downloadchef-dcd979cd994d7d9fa630343ed86d7bd9b02bbda2.tar.gz
Merge pull request #2167 from alexpop/fix_knife_config_logging
print the path to the configuration file used
Diffstat (limited to 'lib')
-rw-r--r--lib/chef/knife.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/chef/knife.rb b/lib/chef/knife.rb
index 6421384f01..0c079792a4 100644
--- a/lib/chef/knife.rb
+++ b/lib/chef/knife.rb
@@ -164,7 +164,6 @@ class Chef
def self.load_config(explicit_config_file)
config_loader = WorkstationConfigLoader.new(explicit_config_file, Chef::Log)
- Chef::Log.debug("Using configuration from #{config_loader.config_location}")
config_loader.load
ui.warn("No knife configuration file found") if config_loader.no_config_found?
@@ -393,6 +392,8 @@ class Chef
merge_configs
apply_computed_config
+ # This has to be after apply_computed_config so that Mixlib::Log is configured
+ Chef::Log.info("Using configuration from #{config[:config_file]}") if config[:config_file]
end
def show_usage