diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2018-07-06 21:57:52 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-06 21:57:52 -0700 |
| commit | b98c6a75b3edbac1c3acc191e8a5b935335b2ee9 (patch) | |
| tree | bf33e9ab752845fcd5f10732b0de4e9649e574cf | |
| parent | 71d6ffa5a7aba4187b724179f8f0004d274a7c33 (diff) | |
| parent | d176c42c151fe37401bbe42a470ff90f6f4b20c2 (diff) | |
| download | chef-b98c6a75b3edbac1c3acc191e8a5b935335b2ee9.tar.gz | |
Merge pull request #7401 from chef/nolan/double-stdout
Fix dupe stdout_logger
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | chef-config/chef-config.gemspec | 2 | ||||
| -rw-r--r-- | lib/chef/application.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 5b31bfd6a7..49ddafb566 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -89,7 +89,7 @@ PATH chef-config (14.3.32) addressable fuzzyurl - mixlib-config (>= 2.2.11, < 3.0) + mixlib-config (>= 2.2.12, < 3.0) mixlib-shellout (~> 2.0) tomlrb (~> 1.2) diff --git a/chef-config/chef-config.gemspec b/chef-config/chef-config.gemspec index f372f944c6..a1afe21b18 100644 --- a/chef-config/chef-config.gemspec +++ b/chef-config/chef-config.gemspec @@ -16,7 +16,7 @@ Gem::Specification.new do |spec| spec.require_paths = ["lib"] spec.add_dependency "mixlib-shellout", "~> 2.0" - spec.add_dependency "mixlib-config", ">= 2.2.11", "< 3.0" + spec.add_dependency "mixlib-config", ">= 2.2.12", "< 3.0" spec.add_dependency "fuzzyurl" spec.add_dependency "addressable" spec.add_dependency "tomlrb", "~> 1.2" diff --git a/lib/chef/application.rb b/lib/chef/application.rb index 811c713464..81637eabb8 100644 --- a/lib/chef/application.rb +++ b/lib/chef/application.rb @@ -205,7 +205,7 @@ class Chef # 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].is_a?(IO) && chef_config[:log_location].tty? ) && !chef_config[:daemonize] + Chef::Config.is_default?(:log_location) && Chef::Config[:log_location].tty? && !Chef::Config[:daemonize] end def configure_stdout_logger |