Permalink
Browse files

Revert "Make sure that ActiveSupport::Logger includes the Logger exte…

…nsions from core_ext/logger" (some confusion over deprecation)

This reverts commit d00f568.
  • Loading branch information...
1 parent d00f568 commit 95f5f8167ff86550d7fa9f5f7419cc9b38ef9704 @dhh dhh committed Dec 21, 2012
@@ -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*
@@ -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
@@ -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
@@ -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

0 comments on commit 95f5f81

Please sign in to comment.