diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index df18b7540be59bfab28bc7a8668887d6333b0bf7..1d11ae2afda38ee93c0f81c7f36c4f1193f74e52 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -1,6 +1,6 @@ ## Rails 4.0.0 (unreleased) ## -* Make sure that ActiveSupport::Logger includes the Logger extensions from core_ext/logger. +* Add ActiveSupport::Logger#silence that works the same as the old Logger#silence extension. *DHH* diff --git a/activesupport/lib/active_support/core_ext/logger.rb b/activesupport/lib/active_support/core_ext/logger.rb index 16fce81445506a4823ab2c5123c85a31a903d2ea..36c8f241b27a52f45d1a04cfedfde15e5bbada06 100644 --- a/activesupport/lib/active_support/core_ext/logger.rb +++ b/activesupport/lib/active_support/core_ext/logger.rb @@ -1,5 +1,6 @@ require 'active_support/core_ext/class/attribute_accessors' require 'active_support/deprecation' +require 'active_support/logger_silence' ActiveSupport::Deprecation.warn 'this file is deprecated and will be removed' @@ -33,25 +34,7 @@ def around_#{level}(before_message, after_message) # def around_debug(before_me # # Note: This logger is deprecated in favor of ActiveSupport::BufferedLogger class Logger - ## - # :singleton-method: - # 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 + include LoggerSilence alias :old_datetime_format= :datetime_format= # Logging date-time format (string passed to +strftime+). Ignored if the formatter diff --git a/activesupport/lib/active_support/logger.rb b/activesupport/lib/active_support/logger.rb index 023e22e6429aa1ad9699cbad8a1187494a20c14e..4a55bbb35030f4909f83d66f35155f10ae6a5d51 100644 --- a/activesupport/lib/active_support/logger.rb +++ b/activesupport/lib/active_support/logger.rb @@ -1,9 +1,11 @@ require 'active_support/core_ext/class/attribute_accessors' +require 'active_support/logger_silence' require 'logger' -require 'active_support/core_ext/logger' module ActiveSupport class Logger < ::Logger + include LoggerSilence + # Broadcasts logs to multiple loggers. def self.broadcast(logger) # :nodoc: Module.new do diff --git a/activesupport/lib/active_support/logger_silence.rb b/activesupport/lib/active_support/logger_silence.rb new file mode 100644 index 0000000000000000000000000000000000000000..a8efdef944fa7def71c0e33c24ae40ed7e113e1f --- /dev/null +++ b/activesupport/lib/active_support/logger_silence.rb @@ -0,0 +1,24 @@ +require 'active_support/concern' + +module LoggerSilence + extend ActiveSupport::Concern + + included do + cattr_accessor :silencer + self.silencer = true + end + + # 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 +end \ No newline at end of file