diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/chef/application.rb | 81 | ||||
| -rw-r--r-- | lib/chef/application/base.rb | 5 | ||||
| -rw-r--r-- | lib/chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir.rb | 6 | ||||
| -rw-r--r-- | lib/chef/client.rb | 20 |
4 files changed, 41 insertions, 71 deletions
diff --git a/lib/chef/application.rb b/lib/chef/application.rb index 2599a78156..0d80123bda 100644 --- a/lib/chef/application.rb +++ b/lib/chef/application.rb @@ -168,28 +168,11 @@ class Chef end end - # Initialize and configure the logger. - # === Loggers and Formatters - # In Chef 10.x and previous, the Logger was the primary/only way that Chef - # communicated information to the user. In Chef 10.14, a new system, "output - # formatters" was added, and in Chef 11.0+ it is the default when running - # chef in a console (detected by `STDOUT.tty?`). Because output formatters - # are more complex than the logger system and users have less experience with - # them, the config option `force_logger` is provided to restore the Chef 10.x - # behavior. - # - # Conversely, for users who want formatter output even when chef is running - # unattended, the `force_formatter` option is provided. - # - # === Auto Log Level - # The `log_level` of `:auto` means `:warn` in the formatter and `:info` in - # the logger. - # def configure_logging configure_log_location - logger.init(MonoLogger.new(chef_config[:log_location])) - if want_additional_logger? - configure_stdout_logger + logger.init(MonoLogger.new(chef_config[:log_location][0])) + chef_config[:log_location][1..-1].each do |log_location| + logger.loggers << MonoLogger.new(log_location) end logger.level = resolve_log_level rescue StandardError => error @@ -197,30 +180,28 @@ class Chef Chef::Application.fatal!("Aborting due to invalid 'log_location' configuration", error) end - # Turn `log_location :syslog` and `log_location :win_evt` into the - # appropriate loggers. + # merge Chef::Config[:log_location] and config[:log_location_cli] + # - the nil default value of log_location_cli means STDOUT + # - the nil default value of log_location is removed + # - Arrays are supported + # - syslog + winevt are converted to those specific logger objects + # def configure_log_location - log_location = chef_config[:log_location] - return unless log_location.respond_to?(:to_sym) - - chef_config[:log_location] = - case log_location.to_sym - when :syslog then logger::Syslog.new - when :win_evt then logger::WinEvt.new - else log_location # Probably a path; let MonoLogger sort it out - end - end + log_location_cli = [ config[:log_location_cli] ].flatten.map { |log_location| log_location.nil? ? STDOUT : log_location } - # Based on config and whether or not STDOUT is a tty, should we setup a - # secondary logger for stdout? - def want_additional_logger? - ( Chef::Config[:log_location].class != IO ) && STDOUT.tty? && !Chef::Config[:daemonize] - end + chef_config[:log_location] = [ chef_config[:log_location], log_location_cli ].flatten.compact.uniq - def configure_stdout_logger - stdout_logger = MonoLogger.new(STDOUT) - stdout_logger.formatter = logger.logger.formatter - logger.loggers << stdout_logger + chef_config[:log_location].map! do |log_location| + case log_location + when :syslog, "syslog" + logger::Syslog.new + when :win_evt, "win_evt" + logger::WinEvt.new + else + # should be a path or STDOUT + log_location + end + end end # Use of output formatters is assumed if `force_formatter` is set or if `force_logger` is not set @@ -228,19 +209,10 @@ class Chef chef_config[:force_formatter] || !chef_config[:force_logger] end - def auto_log_level? - chef_config[:log_level] == :auto - end - - # if log_level is `:auto`, convert it to :warn (when using output formatter) - # or :info (no output formatter). See also +using_output_formatter?+ + # The :auto formatter defaults to :warn with the formatter and :info with the logger def resolve_log_level - if auto_log_level? - if using_output_formatter? - :warn - else - :info - end + if chef_config[:log_level] == :auto + using_output_formatter? ? :warn : :info else chef_config[:log_level] end @@ -406,6 +378,9 @@ class Chef # Log a fatal error message to both STDERR and the Logger, exit the application def fatal!(msg, err = nil) + if Chef::Config[:always_dump_stacktrace] + msg << "\n#{err.backtrace.join("\n")}" + end logger.fatal(msg) Process.exit(normalize_exit_code(err)) end diff --git a/lib/chef/application/base.rb b/lib/chef/application/base.rb index 959ab66ea5..382fd3d66b 100644 --- a/lib/chef/application/base.rb +++ b/lib/chef/application/base.rb @@ -94,11 +94,10 @@ class Chef::Application::Base < Chef::Application description: "Set the log level (auto, trace, debug, info, warn, error, fatal).", proc: lambda { |l| l.to_sym } - option :log_location, + option :log_location_cli, short: "-L LOGLOCATION", long: "--logfile LOGLOCATION", - description: "Set the log file location, defaults to STDOUT - recommended for daemonizing.", - proc: nil + description: "Set the log file location, defaults to STDOUT - recommended for daemonizing." option :always_dump_stacktrace, long: "--[no-]always-dump-stacktrace", diff --git a/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir.rb b/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir.rb index 43847d666a..431b9ecb22 100644 --- a/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir.rb +++ b/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir.rb @@ -140,11 +140,11 @@ class Chef # Used to print out a human-readable file system description def fs_description repo_paths = root_paths || [ File.dirname(child_paths["cookbooks"][0]) ] - result = "repository at #{repo_paths.join(", ")}\n" + result = "repository at #{repo_paths.join(", ")}" if versioned_cookbooks - result << " Multiple versions per cookbook\n" + result << " (Multiple versions per cookbook)" else - result << " One version per cookbook\n" + result << " (One version per cookbook)" end child_paths.each_pair do |name, paths| if paths.any? { |path| !repo_paths.include?(File.dirname(path)) } 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 |