diff options
author | Tim Smith <tsmith84@gmail.com> | 2016-03-01 22:13:54 -0800 |
---|---|---|
committer | Tim Smith <tsmith84@gmail.com> | 2016-03-01 22:13:54 -0800 |
commit | 2c66ca3402ac4ce38b397d61692d660a2f4ed9ec (patch) | |
tree | 1f78a23522dee4ed96d3846b4bac2ab63e10af5d /lib | |
parent | 1fccbaa9810383722e62317c38430103d365ebc4 (diff) | |
download | mixlib-log-2c66ca3402ac4ce38b397d61692d660a2f4ed9ec.tar.gz |
Resolve chef style issues
Diffstat (limited to 'lib')
-rw-r--r-- | lib/mixlib/log.rb | 27 | ||||
-rw-r--r-- | lib/mixlib/log/formatter.rb | 18 |
2 files changed, 22 insertions, 23 deletions
diff --git a/lib/mixlib/log.rb b/lib/mixlib/log.rb index b22387e..5f216f9 100644 --- a/lib/mixlib/log.rb +++ b/lib/mixlib/log.rb @@ -16,19 +16,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -require 'logger' -require 'mixlib/log/version' -require 'mixlib/log/formatter' +require "logger" +require "mixlib/log/version" +require "mixlib/log/formatter" module Mixlib module Log @logger, @loggers = nil - LEVELS = { :debug=>Logger::DEBUG, :info=>Logger::INFO, :warn=>Logger::WARN, :error=>Logger::ERROR, :fatal=>Logger::FATAL}.freeze + LEVELS = { :debug => Logger::DEBUG, :info => Logger::INFO, :warn => Logger::WARN, :error => Logger::ERROR, :fatal => Logger::FATAL }.freeze LEVEL_NAMES = LEVELS.invert.freeze - def reset! @logger, @loggers = nil, nil end @@ -51,7 +50,7 @@ module Mixlib # that had been added to the +loggers+ array will be cleared. def logger=(new_log_device) reset! - @logger=new_log_device + @logger = new_log_device end def use_log_devices(other) @@ -63,7 +62,7 @@ module Mixlib @logger = other.first else msg = "#use_log_devices takes a Mixlib::Log object or array of log devices. " << - "You gave: #{other.inspect}" + "You gave: #{other.inspect}" raise ArgumentError, msg end end @@ -95,14 +94,14 @@ 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 :debug, :info, :warn, :error, or :fatal" if level_int.nil? - loggers.each {|l| l.level = level_int } + loggers.each { |l| l.level = level_int } end - def level(new_level=nil) + def level(new_level = nil) if new_level.nil? LEVEL_NAMES[logger.level] else - self.level=(new_level) + self.level = (new_level) end end @@ -129,11 +128,11 @@ module Mixlib end def <<(msg) - loggers.each {|l| l << msg } + loggers.each { |l| l << msg } end def add(severity, message = nil, progname = nil, &block) - loggers.each {|l| l.add(severity, message, progname, &block) } + loggers.each { |l| l.add(severity, message, progname, &block) } end alias :log :add @@ -142,7 +141,7 @@ module Mixlib # this method gets hit before a call to Mixlib::Logger.init has been made, it will call # Mixlib::Logger.init() with no arguments. def method_missing(method_symbol, *args, &block) - loggers.each {|l| l.send(method_symbol, *args, &block) } + loggers.each { |l| l.send(method_symbol, *args, &block) } end private @@ -150,7 +149,7 @@ module Mixlib def logger_for(*opts) if opts.empty? Logger.new(STDOUT) - elsif LEVELS.keys.inject(true) {|quacks, level| quacks && opts.first.respond_to?(level)} + elsif LEVELS.keys.inject(true) { |quacks, level| quacks && opts.first.respond_to?(level) } opts.first else Logger.new(*opts) diff --git a/lib/mixlib/log/formatter.rb b/lib/mixlib/log/formatter.rb index 2dbd90e..c1eda6d 100644 --- a/lib/mixlib/log/formatter.rb +++ b/lib/mixlib/log/formatter.rb @@ -6,27 +6,27 @@ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -require 'logger' -require 'time' +require "logger" +require "time" module Mixlib module Log class Formatter < Logger::Formatter @@show_time = true - - def self.show_time=(show=false) + + def self.show_time=(show = false) @@show_time = show end - + # Prints a log message as '[time] severity: message' if Chef::Log::Formatter.show_time == true. # Otherwise, doesn't print the time. def call(severity, time, progname, msg) @@ -36,9 +36,9 @@ module Mixlib sprintf("%s: %s\n", severity, msg2str(msg)) end end - + # Converts some argument to a Logger.severity() call to a string. Regular strings pass through like - # normal, Exceptions get formatted as "message (class)\nbacktrace", and other random stuff gets + # normal, Exceptions get formatted as "message (class)\nbacktrace", and other random stuff gets # put through "object.inspect" def msg2str(msg) case msg |