diff options
| author | Thom May <thom@may.lt> | 2018-01-19 10:38:01 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-19 10:38:01 +0000 |
| commit | 80839478f7afc55f040c93dc3a670419296c4cb8 (patch) | |
| tree | 5500763e751775148247ef5a93ea5b0db64ae4cd | |
| parent | 083ab943462e5b14503a67cfecd6b16e6d6be0ef (diff) | |
| parent | 1417310f306571c90977cbe1c4e145d18f0f13d8 (diff) | |
| download | chef-80839478f7afc55f040c93dc3a670419296c4cb8.tar.gz | |
Merge pull request #6752 from chef/lcg/fix-double-logging
fix double-logging bug
| -rw-r--r-- | lib/chef/application.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/application.rb b/lib/chef/application.rb index f5dced7702..b20766c8b5 100644 --- a/lib/chef/application.rb +++ b/lib/chef/application.rb @@ -1,7 +1,7 @@ # # Author:: AJ Christensen (<aj@chef.io>) # Author:: Mark Mzyk (mmzyk@chef.io) -# Copyright:: Copyright 2008-2017, Chef Software Inc. +# Copyright:: Copyright 2008-2018, Chef Software Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -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] != STDOUT ) && STDOUT.tty? && !Chef::Config[:daemonize] + !( Chef::Config[:log_location].is_a?(IO) && Chef::Config[:log_location].tty? ) && !Chef::Config[:daemonize] end def configure_stdout_logger |