From 2518bda97cbbcb33dc9a92e70d5b01c09e64d12d Mon Sep 17 00:00:00 2001
From: Piotr Jakubowski <piotrj@gmail.com>
Date: Thu, 11 Feb 2016 21:00:51 +0100
Subject: Fix logger silencing for broadcasted loggers

Fix #23609

Commit 629efb6 introduced thread safety to logger silencing but it
didn't take into account the fact that the logger can be extended with
broadcasting to other logger.

This commit introduces local_level to broadcasting Module which enables
broadcasted loggers to be properly silenced.
---
 activesupport/lib/active_support/logger.rb         |  7 +++++
 activesupport/lib/active_support/logger_silence.rb | 25 +++--------------
 .../lib/active_support/logger_thread_safe_level.rb | 31 ++++++++++++++++++++++
 3 files changed, 42 insertions(+), 21 deletions(-)
 create mode 100644 activesupport/lib/active_support/logger_thread_safe_level.rb

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/logger.rb b/activesupport/lib/active_support/logger.rb
index 7626b28108..de48e717b6 100644
--- a/activesupport/lib/active_support/logger.rb
+++ b/activesupport/lib/active_support/logger.rb
@@ -1,8 +1,10 @@
 require 'active_support/logger_silence'
+require 'active_support/logger_thread_safe_level'
 require 'logger'
 
 module ActiveSupport
   class Logger < ::Logger
+    include ActiveSupport::LoggerThreadSafeLevel
     include LoggerSilence
 
     # Returns true if the logger destination matches one of the sources
@@ -48,6 +50,11 @@ module ActiveSupport
           logger.level = level
           super(level)
         end
+
+        define_method(:local_level=) do |level|
+          logger.local_level = level if logger.respond_to?(:local_level=)
+          super(level) if respond_to?(:local_level=)
+        end
       end
     end
 
diff --git a/activesupport/lib/active_support/logger_silence.rb b/activesupport/lib/active_support/logger_silence.rb
index 125d81d973..3eb8098c77 100644
--- a/activesupport/lib/active_support/logger_silence.rb
+++ b/activesupport/lib/active_support/logger_silence.rb
@@ -7,39 +7,22 @@ module LoggerSilence
 
   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_local_level            = local_levels[local_log_id]
-        local_levels[local_log_id] = temporary_level
+        old_local_level            = local_level
+        self.local_level           = temporary_level
 
         yield self
       ensure
-        if old_local_level
-          local_levels[local_log_id] = old_local_level
-        else
-          local_levels.delete(local_log_id)
-        end
+        self.local_level = old_local_level
       end
     else
       yield self
     end
   end
-end
\ No newline at end of file
+end
diff --git a/activesupport/lib/active_support/logger_thread_safe_level.rb b/activesupport/lib/active_support/logger_thread_safe_level.rb
new file mode 100644
index 0000000000..0aad93e7f2
--- /dev/null
+++ b/activesupport/lib/active_support/logger_thread_safe_level.rb
@@ -0,0 +1,31 @@
+require 'active_support/concern'
+
+module ActiveSupport
+  module LoggerThreadSafeLevel
+    extend ActiveSupport::Concern
+
+    def after_initialize
+      @local_levels = Concurrent::Map.new(:initial_capacity => 2)
+    end
+
+    def local_log_id
+      Thread.current.__id__
+    end
+
+    def local_level
+      @local_levels[local_log_id]
+    end
+
+    def local_level=(level)
+      if level
+        @local_levels[local_log_id] = level
+      else
+        @local_levels.delete(local_log_id)
+      end
+    end
+
+    def level
+      local_level || super
+    end
+  end
+end
-- 
cgit v1.2.3