Updating a few logging references to include :tracesp/cli-logging-options

Signed-off-by: Stuart Preston <stuart@chef.io>

5 files changed, 11 insertions, 3 deletions

diff --git a/chef-config/lib/chef-config/config.rb b/chef-config/lib/chef-config/config.rb
index d1f33d3400..ef792b2db7 100644
--- a/chef-config/lib/chef-config/config.rb
+++ b/chef-config/lib/chef-config/config.rb
@@ -322,6 +322,7 @@ module ChefConfig
     default :umask, 0022
 
     # Valid log_levels are:
+    # * :trace
     # * :debug
     # * :info
     # * :warn
diff --git a/lib/chef/application/apply.rb b/lib/chef/application/apply.rb
index d7f2359b02..ec627ada2e 100644
--- a/lib/chef/application/apply.rb
+++ b/lib/chef/application/apply.rb
@@ -70,7 +70,7 @@ class Chef::Application::Apply < Chef::Application
   option :log_level,
     :short        => "-l LEVEL",
     :long         => "--log_level LEVEL",
-    :description  => "Set the log level (debug, info, warn, error, fatal)",
+    :description  => "Set the log level (trace, debug, info, warn, error, fatal)",
     :proc         => lambda { |l| l.to_sym }
 
   option :help,
diff --git a/lib/chef/application/client.rb b/lib/chef/application/client.rb
index 5ee1d1a4ec..28de71fa71 100644
--- a/lib/chef/application/client.rb
+++ b/lib/chef/application/client.rb
@@ -82,7 +82,7 @@ class Chef::Application::Client < Chef::Application
   option :log_level,
     :short        => "-l LEVEL",
     :long         => "--log_level LEVEL",
-    :description  => "Set the log level (auto, debug, info, warn, error, fatal)",
+    :description  => "Set the log level (auto, trace, debug, info, warn, error, fatal)",
     :proc         => lambda { |l| l.to_sym }
 
   option :log_location,
diff --git a/lib/chef/application/solo.rb b/lib/chef/application/solo.rb
index 2294d63c21..646d68182c 100644
--- a/lib/chef/application/solo.rb
+++ b/lib/chef/application/solo.rb
@@ -81,7 +81,7 @@ class Chef::Application::Solo < Chef::Application
   option :log_level,
     :short        => "-l LEVEL",
     :long         => "--log_level LEVEL",
-    :description  => "Set the log level (debug, info, warn, error, fatal)",
+    :description  => "Set the log level (trace, debug, info, warn, error, fatal)",
     :proc         => lambda { |l| l.to_sym }
 
   option :log_location,
diff --git a/lib/chef/null_logger.rb b/lib/chef/null_logger.rb
index 927cfc0c08..5781d8e055 100644
--- a/lib/chef/null_logger.rb
+++ b/lib/chef/null_logger.rb
@@ -42,6 +42,9 @@ class Chef
     def debug(message, &block)
     end
 
+    def trace(message, &block)
+    end
+
     def add(severity, message = nil, progname = nil)
     end
 
@@ -68,5 +71,9 @@ class Chef
       false
     end
 
+    def trace?
+      false
+    end
+
   end
 end