Logging consistency fixes.lcg/chef-16-logging-fixed

- The doc formatter is now Chef::Config[:log_location]-aware
  and will log to files as well
- There is now consistency where doc formatter output never
  surprisingly changes to log formatter based on destination
- The "cli" log_location and the "config" log_location are now
  treated separately, so a log_location in the client.rb will
  always force output to a logfile, in addition to output
  to STDOUT if necessary
- The logic around STDOUT is now simplified, if its open we
  log to it, if its closed we don't, if you're daemonized we
  assume you're capturing STDOUT via your process manager
- The log_location variables are now Arrays

Things not done:

- The cli can't specify an array, it would be nice to support
  an accumulator pattern here.  Would also need to support
  disabling STDOUT logging though.

- Using the syslog or winevt logging devices requires the use
  of the logger, which precludes using the formatter.

- Some people may want to have log-formatter style output
  to the log file and doc formatter style output to STDOUT
  which is not very possible right now.  Right now we are
  consistent in that you get either the logger both places
  or the formatter both places.  This use case is complicated
  by the fact that they will want :info level logging for
  the logger, but :warn level logging for the doc formatter
  and that is another global.

- To do that latter thing right would probably require sending
  log messages to the formatter, and supporting a different
  log level in the formatter vs. the logger and then supporting
  the STDOUT/cli loggging being the formatter, while the
  log_location/config logging being the logger.

Those were way out of scope for what I could get done for Chef-16.

Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>

1 files changed, 8 insertions, 12 deletions

diff --git a/lib/chef/client.rb b/lib/chef/client.rb
index 769d1a4989..a43740258d 100644
--- a/lib/chef/client.rb
+++ b/lib/chef/client.rb
@@ -353,19 +353,15 @@ class Chef
 
     # @api private
     def formatters_for_run
-      if Chef::Config.formatters.empty?
-        [default_formatter]
-      else
-        Chef::Config.formatters
-      end
-    end
+      return Chef::Config.formatters unless Chef::Config.formatters.empty?
 
-    # @api private
-    def default_formatter
-      if !Chef::Config[:force_logger] || Chef::Config[:force_formatter]
-        [:doc]
-      else
-        [:null]
+      [ Chef::Config[:log_location] ].flatten.map do |log_location|
+        log_location = nil if log_location == STDOUT
+        if !Chef::Config[:force_logger] || Chef::Config[:force_formatter]
+          [:doc, log_location]
+        else
+          [:null]
+        end
       end
     end