diff options
author | Tim Smith <tsmith@chef.io> | 2019-07-21 23:06:21 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-21 23:06:21 -0700 |
commit | 87213334119a6dc3b5c4fd469f4850a74343b984 (patch) | |
tree | 8b730eecbc1c4b6b124e6c319a377b9baba55832 /lib/mixlib/log.rb | |
parent | 7e9373f5dd41a9ac258102df01f45bed8467f2f9 (diff) | |
parent | 616f57e849331ee349ad5fda431ec86b4e3e4b65 (diff) | |
download | mixlib-log-87213334119a6dc3b5c4fd469f4850a74343b984.tar.gz |
Merge pull request #54 from zenspider/zenspider/remove_all_warnings
Resolve all warnings emitted during testing
Diffstat (limited to 'lib/mixlib/log.rb')
-rw-r--r-- | lib/mixlib/log.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/mixlib/log.rb b/lib/mixlib/log.rb index 491bbc8..e57ffcd 100644 --- a/lib/mixlib/log.rb +++ b/lib/mixlib/log.rb @@ -27,11 +27,12 @@ module Mixlib module Log include Logging - @logger, @loggers = nil def reset! + @logger ||= nil + @loggers ||= [] close! - @logger, @loggers = nil, nil + @logger = @loggers = nil @metadata = {} end @@ -46,7 +47,7 @@ module Mixlib # and creates a new one if it doesn't yet exist ## def logger - @logger || init + @logger ||= init end # Sets the log device to +new_log_device+. Any additional loggers @@ -170,7 +171,7 @@ module Mixlib def logger_for(*opts) if opts.empty? - Mixlib::Log::Logger.new(STDOUT) + Mixlib::Log::Logger.new($stdout) elsif LEVELS.keys.inject(true) { |quacks, level| quacks && opts.first.respond_to?(level) } opts.first else @@ -190,6 +191,7 @@ module Mixlib # via public API. In order to reduce amount of impact and # handle only File type log devices I had to use this method # to get access to it. + next unless logger.instance_variable_defined?(:"@logdev") next unless (logdev = logger.instance_variable_get(:"@logdev")) loggers_to_close << logger if logdev.filename end |