diff options
| author | Tim Smith <tsmith@chef.io> | 2018-07-10 10:57:40 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-10 10:57:40 -0700 |
| commit | 70da75dad1a6c2373a574c213e36c2135546782f (patch) | |
| tree | 4199b3353c9e1bf59cfdf747f61ab9b25adcb2b5 | |
| parent | 0980445ffc7bb5e00d146cb955bce5986bacfeb2 (diff) | |
| parent | 6cfb0bfc1b512aa011cb17b6ad011109e0aa36d8 (diff) | |
| download | chef-70da75dad1a6c2373a574c213e36c2135546782f.tar.gz | |
Merge pull request #7447 from chef/btm/backport-dupe-logger
Backport duplicate logger fix
| -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 ad5b791fbf..27b4afb196 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -87,7 +87,7 @@ PATH chef-config (13.9.7) addressable fuzzyurl - mixlib-config (~> 2.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 1dc1a118ff..0db9f548b4 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.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 b20766c8b5..98bdca09a1 100644 --- a/lib/chef/application.rb +++ b/lib/chef/application.rb @@ -177,7 +177,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 |