From 629efb605728b31ad9644f6f0acaf3760b641a29 Mon Sep 17 00:00:00 2001
From: "Carl P. Corliss" <rabbitt@gmail.com>
Date: Tue, 9 Jun 2015 22:38:53 -0400
Subject: Fixes LoggerSilence#silence threadsafety - uses instance defined
 level if no custom local log level defined - Keeps track of local log level
 per [ thread + object-instance ] - prevents memory leakage by removing local
 level hash key/value on #silence method exit - avoids the use of Thread local
 variables

---
 activesupport/lib/active_support/logger.rb         | 14 +++++++++++++
 activesupport/lib/active_support/logger_silence.rb | 24 ++++++++++++++++++++--
 2 files changed, 36 insertions(+), 2 deletions(-)

(limited to 'activesupport/lib/active_support')

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.
diff --git a/activesupport/lib/active_support/logger_silence.rb b/activesupport/lib/active_support/logger_silence.rb
index 7d92256f24..690e5596f7 100644
--- a/activesupport/lib/active_support/logger_silence.rb
+++ b/activesupport/lib/active_support/logger_silence.rb
@@ -1,22 +1,42 @@
 require 'active_support/concern'
 require 'active_support/core_ext/module/attribute_accessors'
+require 'concurrent'
 
 module LoggerSilence
   extend ActiveSupport::Concern
 
   included do
     cattr_accessor :silencer
+    attr_reader :local_levels
     self.silencer = true
   end
 
+  def after_initialize
+    @local_levels = Concurrent::Map.new(:initial_capacity => 2)
+  end
+
+  def local_log_id
+    Thread.current.__id__
+  end
+
+  def level
+    local_levels[local_log_id] || super
+  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
+        old_local_level            = local_levels[local_log_id]
+        local_levels[local_log_id] = temporary_level
+
         yield self
       ensure
-        self.level = old_logger_level
+        if old_local_level
+          local_levels[local_log_id] = old_local_level
+        else
+          local_levels.delete(local_log_id)
+        end
       end
     else
       yield self
-- 
cgit v1.2.3