mixlib-log 3.0.1 → 3.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12e1f4cc08cad66547c7444d11e2f01e2513d840b454757a9c8dc2ef4ef6a717
-  data.tar.gz: ad633e7fcc38007438b75470a9b3eb04ef6ae28bba98a9a8beec2d7fa6c5f97c
+  metadata.gz: 95774ad5586c72101fe71dde872dc0f88c01de6d9ddffb152b3015694e76b397
+  data.tar.gz: ed308a5b638fb1e78389c868e58c0a41385e6f2dd78c20f92e9b1e1c2f3bf351
 SHA512:
-  metadata.gz: '0792fef35109d52062fdde317bb13accbc29f9ecce87becfeded849f3fa5f2de620534e02184d3ca9c4f546f2423efe6bcf371d74b452a542f348f6aab57bb34'
-  data.tar.gz: c64a3941e41f7e821740b14decb32604b4f30a0e9c024e36d6f13b22eedde444116c5315feba3c1e714442e48d9cae30222a6b3ddba54fd60748351ecd6ca3f2
+  metadata.gz: a28f3d2af4a0c823cad7f648fdd9f16d58f16e6ad65b7f2e154c2db904ff4bd7494444c6a6c04115b08463f463f0d589fd874eea0457d591b085e2b914319a4b
+  data.tar.gz: 1a92978027ba1bc10acbb74b5959a21f27d1c4918e85e29b893084bea4a3676cb83e3788ec10d85a3cba33fe1d5f1080acdcd3067acfac0c30b7fab896104121

data/lib/mixlib/log.rb

@@ -17,26 +17,27 @@
 # limitations under the License.
 
 require "logger"
-require "mixlib/log/version"
-require "mixlib/log/formatter"
-require "mixlib/log/child"
-require "mixlib/log/logging"
-require "mixlib/log/logger"
+require_relative "log/version"
+require_relative "log/formatter"
+require_relative "log/child"
+require_relative "log/logging"
+require_relative "log/logger"
 
 module Mixlib
   module Log
 
     include Logging
-    @logger, @loggers = nil
 
     def reset!
+      @logger  ||= nil
+      @loggers ||= []
       close!
-      @logger, @loggers = nil, nil
+      @logger = @loggers = nil
       @metadata = {}
     end
 
     # An Array of log devices that will be logged to. Defaults to just the default
-    # @logger log device, but you can push to this array to add more devices.
+    # \@logger log device, but you can push to this array to add more devices.
     def loggers
       @loggers ||= [logger]
     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
@@ -60,7 +61,7 @@ module Mixlib
       if other.respond_to?(:loggers) && other.respond_to?(:logger)
         @loggers = other.loggers
         @logger = other.logger
-      elsif other.kind_of?(Array)
+      elsif other.is_a?(Array)
         @loggers = other
         @logger = other.first
       else
@@ -81,7 +82,7 @@ module Mixlib
     def init(*opts)
       reset!
       @logger = logger_for(*opts)
-      @logger.formatter = Mixlib::Log::Formatter.new() if @logger.respond_to?(:formatter=)
+      @logger.formatter = Mixlib::Log::Formatter.new if @logger.respond_to?(:formatter=)
       @logger.level = Logger::WARN
       @configured = true
       @parent = nil
@@ -109,6 +110,7 @@ module Mixlib
     def level=(new_level)
       level_int = LEVEL_NAMES.key?(new_level) ? new_level : LEVELS[new_level]
       raise ArgumentError, "Log level must be one of :trace, :debug, :info, :warn, :error, or :fatal" if level_int.nil?
+
       loggers.each { |l| l.level = level_int }
     end
 
@@ -124,7 +126,7 @@ module Mixlib
     # Note that we *only* query the default logger (@logger) and not any other
     # loggers that may have been added, even though it is possible to configure
     # two (or more) loggers at different log levels.
-    [:trace?, :debug?, :info?, :warn?, :error?, :fatal?].each do |method_name|
+    %i{trace? debug? info? warn? error? fatal?}.each do |method_name|
       define_method(method_name) do
         logger.send(method_name)
       end
@@ -136,7 +138,7 @@ module Mixlib
 
     def add(severity, message = nil, progname = nil, data: {}, &block)
       message, progname, data = yield if block_given?
-      data = metadata.merge(data) if metadata.kind_of?(Hash) && data.kind_of?(Hash)
+      data = metadata.merge(data) if metadata.is_a?(Hash) && data.is_a?(Hash)
       loggers.each do |l|
         # if we don't have any metadata, let's not do the potentially expensive
         # merging and managing that this call requires
@@ -170,7 +172,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,7 +192,9 @@ 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
       loggers_to_close

data/lib/mixlib/log/child.rb

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "mixlib/log/logging"
+require_relative "logging"
 
 module Mixlib
   module Log
@@ -36,14 +36,14 @@ module Mixlib
       # Note that we *only* query the default logger (@logger) and not any other
       # loggers that may have been added, even though it is possible to configure
       # two (or more) loggers at different log levels.
-      [:trace?, :debug?, :info?, :warn?, :error?, :fatal?].each do |method_name|
+      %i{trace? debug? info? warn? error? fatal?}.each do |method_name|
         define_method(method_name) do
           parent.send(method_name)
         end
       end
 
       def add(severity, message = nil, progname = nil, data: {}, &block)
-        data = metadata.merge(data) if data.kind_of?(Hash)
+        data = metadata.merge(data) if data.is_a?(Hash)
         parent.send(:pass, severity, message, progname, data: data, &block)
       end
 

data/lib/mixlib/log/formatter.rb

@@ -31,7 +31,7 @@ module Mixlib
       # Otherwise, doesn't print the time.
       def call(severity, time, progname, msg)
         if @@show_time
-          sprintf("[%s] %s: %s\n", time.iso8601(), severity, msg2str(msg))
+          sprintf("[%s] %s: %s\n", time.iso8601, severity, msg2str(msg))
         else
           sprintf("%s: %s\n", severity, msg2str(msg))
         end

data/lib/mixlib/log/logger.rb

@@ -1,5 +1,5 @@
 require "logger"
-require "mixlib/log/logging"
+require_relative "logging"
 
 # A subclass of Ruby's stdlib Logger with all the mutex and logrotation stuff
 # ripped out, and metadata added in.
@@ -21,7 +21,7 @@ module Mixlib
       #
       # +logdev+::
       #   The log device.  This is a filename (String) or IO object (typically
-      #   +STDOUT+, +STDERR+, or an open file).
+      #   +$stdout+, +$stderr+, or an open file).
       # +shift_age+::
       #   Number of old log files to keep, *or* frequency of rotation (+daily+,
       #   +weekly+ or +monthly+).
@@ -45,14 +45,16 @@ module Mixlib
 
       def add_data(severity, message, progname, data: {})
         return true if @logdev.nil? || severity < @level
+
         data ||= {}
-        if message.kind_of?(::Exception)
+        if message.is_a?(::Exception)
           data[:err] = message
         else
           data[:msg] = message
         end
         @logdev.write(
-          format_message(to_label(severity), Time.now, progname, data))
+          format_message(to_label(severity), Time.now, progname, data)
+        )
         true
       end
       alias_method :add, :add_data

data/lib/mixlib/log/logging.rb

@@ -41,7 +41,7 @@ module Mixlib
 
       # Define the standard logger methods on this class programmatically.
       # No need to incur method_missing overhead on every log call.
-      [:trace, :debug, :info, :warn, :error, :fatal].each do |method_name|
+      %i{trace debug info warn error fatal}.each do |method_name|
         level = LEVELS[method_name]
         define_method(method_name) do |msg = nil, data: {}, &block|
           pass(level, msg, data: data, &block)

data/lib/mixlib/log/version.rb

@@ -1,5 +1,5 @@
 module Mixlib
   module Log
-    VERSION = "3.0.1".freeze
+    VERSION = "3.0.8".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-log
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.8
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-04 00:00:00.000000000 Z
+date: 2019-12-30 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: info@chef.io
@@ -42,8 +42,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A gem that provides a simple mixin for log functionality