mirror of
https://github.com/github/rails.git
synced 2026-01-26 14:58:11 -05:00
Moved Logger extensions into core_ext
This commit is contained in:
Joshua Peek
@@ -28,7 +28,6 @@ require 'active_support/callbacks'
|
||||
|
||||
require 'active_support/core_ext'
|
||||
|
||||
require 'active_support/clean_logger'
|
||||
require 'active_support/buffered_logger'
|
||||
|
||||
require 'active_support/gzip'
|
||||
|
||||
@@ -1,127 +0,0 @@
|
||||
require 'logger'
|
||||
require 'active_support/core_ext/class/attribute_accessors'
|
||||
|
||||
# Extensions to the built in Ruby logger.
|
||||
#
|
||||
# If you want to use the default log formatter as defined in the Ruby core, then you
|
||||
# will need to set the formatter for the logger as in:
|
||||
#
|
||||
# logger.formatter = Formatter.new
|
||||
#
|
||||
# You can then specify the datetime format, for example:
|
||||
#
|
||||
# logger.datetime_format = "%Y-%m-%d"
|
||||
#
|
||||
# Note: This logger is deprecated in favor of ActiveSupport::BufferedLogger
|
||||
class Logger
|
||||
# Set to false to disable the silencer
|
||||
cattr_accessor :silencer
|
||||
self.silencer = true
|
||||
|
||||
# Silences the logger for the duration of the block.
|
||||
def silence(temporary_level = Logger::ERROR)
|
||||
if silencer
|
||||
begin
|
||||
old_logger_level, self.level = level, temporary_level
|
||||
yield self
|
||||
ensure
|
||||
self.level = old_logger_level
|
||||
end
|
||||
else
|
||||
yield self
|
||||
end
|
||||
end
|
||||
|
||||
alias :old_datetime_format= :datetime_format=
|
||||
# Logging date-time format (string passed to +strftime+). Ignored if the formatter
|
||||
# does not respond to datetime_format=.
|
||||
def datetime_format=(datetime_format)
|
||||
formatter.datetime_format = datetime_format if formatter.respond_to?(:datetime_format=)
|
||||
end
|
||||
|
||||
alias :old_datetime_format :datetime_format
|
||||
# Get the logging datetime format. Returns nil if the formatter does not support
|
||||
# datetime formatting.
|
||||
def datetime_format
|
||||
formatter.datetime_format if formatter.respond_to?(:datetime_format)
|
||||
end
|
||||
|
||||
alias :old_formatter :formatter if method_defined?(:formatter)
|
||||
# Get the current formatter. The default formatter is a SimpleFormatter which only
|
||||
# displays the log message
|
||||
def formatter
|
||||
@formatter ||= SimpleFormatter.new
|
||||
end
|
||||
|
||||
unless const_defined? :Formatter
|
||||
class Formatter
|
||||
Format = "%s, [%s#%d] %5s -- %s: %s\n"
|
||||
|
||||
attr_accessor :datetime_format
|
||||
|
||||
def initialize
|
||||
@datetime_format = nil
|
||||
end
|
||||
|
||||
def call(severity, time, progname, msg)
|
||||
Format % [severity[0..0], format_datetime(time), $$, severity, progname,
|
||||
msg2str(msg)]
|
||||
end
|
||||
|
||||
private
|
||||
def format_datetime(time)
|
||||
if @datetime_format.nil?
|
||||
time.strftime("%Y-%m-%dT%H:%M:%S.") << "%06d " % time.usec
|
||||
else
|
||||
time.strftime(@datetime_format)
|
||||
end
|
||||
end
|
||||
|
||||
def msg2str(msg)
|
||||
case msg
|
||||
when ::String
|
||||
msg
|
||||
when ::Exception
|
||||
"#{ msg.message } (#{ msg.class })\n" <<
|
||||
(msg.backtrace || []).join("\n")
|
||||
else
|
||||
msg.inspect
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
# Simple formatter which only displays the message.
|
||||
class SimpleFormatter < Logger::Formatter
|
||||
# This method is invoked when a log event occurs
|
||||
def call(severity, timestamp, progname, msg)
|
||||
"#{String === msg ? msg : msg.inspect}\n"
|
||||
end
|
||||
end
|
||||
|
||||
private
|
||||
alias old_format_message format_message
|
||||
|
||||
# Ruby 1.8.3 transposed the msg and progname arguments to format_message.
|
||||
# We can't test RUBY_VERSION because some distributions don't keep Ruby
|
||||
# and its standard library in sync, leading to installations of Ruby 1.8.2
|
||||
# with Logger from 1.8.3 and vice versa.
|
||||
if method_defined?(:formatter=)
|
||||
def format_message(severity, timestamp, progname, msg)
|
||||
formatter.call(severity, timestamp, progname, msg)
|
||||
end
|
||||
else
|
||||
def format_message(severity, timestamp, msg, progname)
|
||||
formatter.call(severity, timestamp, progname, msg)
|
||||
end
|
||||
|
||||
attr_writer :formatter
|
||||
public :formatter=
|
||||
|
||||
alias old_format_datetime format_datetime
|
||||
def format_datetime(datetime) datetime end
|
||||
|
||||
alias old_msg2str msg2str
|
||||
def msg2str(msg) msg end
|
||||
end
|
||||
end
|
||||
@@ -12,5 +12,132 @@ class Logger
|
||||
end_eval
|
||||
end
|
||||
[:debug, :info, :error, :fatal].each {|level| define_around_helper(level) }
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
require 'logger'
|
||||
|
||||
# Extensions to the built in Ruby logger.
|
||||
#
|
||||
# If you want to use the default log formatter as defined in the Ruby core, then you
|
||||
# will need to set the formatter for the logger as in:
|
||||
#
|
||||
# logger.formatter = Formatter.new
|
||||
#
|
||||
# You can then specify the datetime format, for example:
|
||||
#
|
||||
# logger.datetime_format = "%Y-%m-%d"
|
||||
#
|
||||
# Note: This logger is deprecated in favor of ActiveSupport::BufferedLogger
|
||||
class Logger
|
||||
# Set to false to disable the silencer
|
||||
cattr_accessor :silencer
|
||||
self.silencer = true
|
||||
|
||||
# Silences the logger for the duration of the block.
|
||||
def silence(temporary_level = Logger::ERROR)
|
||||
if silencer
|
||||
begin
|
||||
old_logger_level, self.level = level, temporary_level
|
||||
yield self
|
||||
ensure
|
||||
self.level = old_logger_level
|
||||
end
|
||||
else
|
||||
yield self
|
||||
end
|
||||
end
|
||||
|
||||
alias :old_datetime_format= :datetime_format=
|
||||
# Logging date-time format (string passed to +strftime+). Ignored if the formatter
|
||||
# does not respond to datetime_format=.
|
||||
def datetime_format=(datetime_format)
|
||||
formatter.datetime_format = datetime_format if formatter.respond_to?(:datetime_format=)
|
||||
end
|
||||
|
||||
alias :old_datetime_format :datetime_format
|
||||
# Get the logging datetime format. Returns nil if the formatter does not support
|
||||
# datetime formatting.
|
||||
def datetime_format
|
||||
formatter.datetime_format if formatter.respond_to?(:datetime_format)
|
||||
end
|
||||
|
||||
alias :old_formatter :formatter if method_defined?(:formatter)
|
||||
# Get the current formatter. The default formatter is a SimpleFormatter which only
|
||||
# displays the log message
|
||||
def formatter
|
||||
@formatter ||= SimpleFormatter.new
|
||||
end
|
||||
|
||||
unless const_defined? :Formatter
|
||||
class Formatter
|
||||
Format = "%s, [%s#%d] %5s -- %s: %s\n"
|
||||
|
||||
attr_accessor :datetime_format
|
||||
|
||||
def initialize
|
||||
@datetime_format = nil
|
||||
end
|
||||
|
||||
def call(severity, time, progname, msg)
|
||||
Format % [severity[0..0], format_datetime(time), $$, severity, progname,
|
||||
msg2str(msg)]
|
||||
end
|
||||
|
||||
private
|
||||
def format_datetime(time)
|
||||
if @datetime_format.nil?
|
||||
time.strftime("%Y-%m-%dT%H:%M:%S.") << "%06d " % time.usec
|
||||
else
|
||||
time.strftime(@datetime_format)
|
||||
end
|
||||
end
|
||||
|
||||
def msg2str(msg)
|
||||
case msg
|
||||
when ::String
|
||||
msg
|
||||
when ::Exception
|
||||
"#{ msg.message } (#{ msg.class })\n" <<
|
||||
(msg.backtrace || []).join("\n")
|
||||
else
|
||||
msg.inspect
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
# Simple formatter which only displays the message.
|
||||
class SimpleFormatter < Logger::Formatter
|
||||
# This method is invoked when a log event occurs
|
||||
def call(severity, timestamp, progname, msg)
|
||||
"#{String === msg ? msg : msg.inspect}\n"
|
||||
end
|
||||
end
|
||||
|
||||
private
|
||||
alias old_format_message format_message
|
||||
|
||||
# Ruby 1.8.3 transposed the msg and progname arguments to format_message.
|
||||
# We can't test RUBY_VERSION because some distributions don't keep Ruby
|
||||
# and its standard library in sync, leading to installations of Ruby 1.8.2
|
||||
# with Logger from 1.8.3 and vice versa.
|
||||
if method_defined?(:formatter=)
|
||||
def format_message(severity, timestamp, progname, msg)
|
||||
formatter.call(severity, timestamp, progname, msg)
|
||||
end
|
||||
else
|
||||
def format_message(severity, timestamp, msg, progname)
|
||||
formatter.call(severity, timestamp, progname, msg)
|
||||
end
|
||||
|
||||
attr_writer :formatter
|
||||
public :formatter=
|
||||
|
||||
alias old_format_datetime format_datetime
|
||||
def format_datetime(datetime) datetime end
|
||||
|
||||
alias old_msg2str msg2str
|
||||
def msg2str(msg) msg end
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user