summaryrefslogtreecommitdiff
path: root/lib/chef/application.rb
diff options
context:
space:
mode:
authorNolan Davidson <ndavidson@chef.io>2018-06-28 11:45:06 -0400
committerLamont Granquist <lamont@scriptkiddie.org>2018-07-05 17:15:22 -0700
commita8f0583ce244896113f030564d204e4969b2c989 (patch)
tree4a3f4c98be90a96f346cff4132d97cde0dbe08f1 /lib/chef/application.rb
parentd3d4198c971830715bbf4f5feee7e9f61503f9df (diff)
downloadchef-a8f0583ce244896113f030564d204e4969b2c989.tar.gz
Fix dupe stdout_logger
I _think_ this resolves issue #7184 Basically reverting back to the previous logic of `want_additional_logger?`. It was mentioned in the issue comments that the comparison against `STDOUT` wasn't working, but it seems to work for me currently on Centos7. Signed-off-by: Nolan Davidson <ndavidson@chef.io>
Diffstat (limited to 'lib/chef/application.rb')
-rw-r--r--lib/chef/application.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/application.rb b/lib/chef/application.rb
index 811c713464..3d7f1fd4f2 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[:log_location] != STDOUT ) && STDOUT.tty? && !Chef::Config[:daemonize]
end
def configure_stdout_logger