aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/logger.rb
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2015-12-23 17:37:04 -0200
committerRafael França <rafaelmfranca@gmail.com>2015-12-23 17:37:04 -0200
commitd6fe65a36d3b8f9943e38d70e7eba3e8ac28aed4 (patch)
tree4561f7a11ead2ada27aa080709e619c60979d1cd /activesupport/lib/active_support/logger.rb
parent08724cc1549dbe6fa3c02ef030b89b106c91a51c (diff)
parent629efb605728b31ad9644f6f0acaf3760b641a29 (diff)
downloadrails-d6fe65a36d3b8f9943e38d70e7eba3e8ac28aed4.tar.gz
rails-d6fe65a36d3b8f9943e38d70e7eba3e8ac28aed4.tar.bz2
rails-d6fe65a36d3b8f9943e38d70e7eba3e8ac28aed4.zip
Merge pull request #20507 from rabbitt/bugfix/logger-threadsafety
Fixes LoggerSilence#silence threadsafety
Diffstat (limited to 'activesupport/lib/active_support/logger.rb')
-rw-r--r--activesupport/lib/active_support/logger.rb14
1 files changed, 14 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/logger.rb b/activesupport/lib/active_support/logger.rb
index 82117a64d2..520268b244 100644
--- a/activesupport/lib/active_support/logger.rb
+++ b/activesupport/lib/active_support/logger.rb
@@ -46,6 +46,20 @@ module ActiveSupport
super
@formatter = SimpleFormatter.new
@broadcast_messages = true
+ after_initialize if respond_to? :after_initialize
+ end
+
+ def add(severity, message = nil, progname = nil, &block)
+ return true if @logdev.nil? || (severity || UNKNOWN) < level
+ super
+ end
+
+ Logger::Severity.constants.each do |severity|
+ class_eval(<<-EOT, __FILE__, __LINE__ + 1)
+ def #{severity.downcase}? # def debug?
+ Logger::#{severity} >= level # DEBUG >= level
+ end # end
+ EOT
end
# Simple formatter which only displays the message.