diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2018-07-05 17:16:51 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2018-07-05 17:16:51 -0700 |
| commit | d176c42c151fe37401bbe42a470ff90f6f4b20c2 (patch) | |
| tree | a3845b9cb66a2a2db61b7d7650b17706fff0f230 | |
| parent | 1e241b3f4327dfad0c26d141fe64eacd1d89494b (diff) | |
| download | chef-nolan/double-stdout.tar.gz | |
fix logger logic with is_default? from new mixlib-configchef-nolan/double-stdout
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
| -rw-r--r-- | Gemfile.lock | 10 | ||||
| -rw-r--r-- | chef-config/chef-config.gemspec | 2 | ||||
| -rw-r--r-- | lib/chef/application.rb | 6 |
3 files changed, 7 insertions, 11 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 07ff8835fa..539825271c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/chef/chefstyle.git - revision: fac2105b132fddc5f671411b2b5f1cba7a2307c3 + revision: c16b9ceab413259bda43a2d683f1f918c1be3db5 branch: master specs: chefstyle (0.10.0) @@ -89,7 +89,7 @@ PATH chef-config (14.3.29) addressable fuzzyurl - mixlib-config (>= 2.2.11, < 3.0) + mixlib-config (>= 2.2.12, < 3.0) mixlib-shellout (~> 2.0) tomlrb (~> 1.2) @@ -149,7 +149,7 @@ GEM highline (1.7.10) htmlentities (4.3.4) iniparse (1.4.4) - inspec-core (2.2.27) + inspec-core (2.2.34) addressable (~> 2.4) faraday (>= 0.9.0) hashie (~> 3.4) @@ -179,7 +179,7 @@ GEM mixlib-log mixlib-authentication (2.1.1) mixlib-cli (1.7.0) - mixlib-config (2.2.11) + mixlib-config (2.2.12) tomlrb mixlib-log (2.0.4) mixlib-shellout (2.3.2) @@ -300,7 +300,7 @@ GEM systemu (2.6.5) thor (0.20.0) tomlrb (1.2.7) - train-core (1.4.19) + train-core (1.4.21) json (>= 1.8, < 3.0) mixlib-shellout (~> 2.0) travis (1.8.8) 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 9df8de156a..81637eabb8 100644 --- a/lib/chef/application.rb +++ b/lib/chef/application.rb @@ -205,11 +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? - ( !log_location_default? ) && STDOUT.tty? && !Chef::Config[:daemonize] - end - - def log_location_default? - Chef::Config.configurables[:log_location].instance_variable_get(:@default_value).inspect == Chef::Config[:log_location].inspect + Chef::Config.is_default?(:log_location) && Chef::Config[:log_location].tty? && !Chef::Config[:daemonize] end def configure_stdout_logger |