simplifying buffered logger for easier and slightly more performant codes. pumpkin

2 files changed, 5 insertions, 10 deletions

diff --git a/activesupport/lib/active_support/buffered_logger.rb b/activesupport/lib/active_support/buffered_logger.rb
index e41731f3e7..88b50fc506 100644
--- a/activesupport/lib/active_support/buffered_logger.rb
+++ b/activesupport/lib/active_support/buffered_logger.rb
@@ -41,7 +41,7 @@ module ActiveSupport
 
     def initialize(log, level = DEBUG)
       @level         = level
-      @buffer        = {}
+      @buffer        = Hash.new { |h,k| h[k] = [] }
       @auto_flushing = 1
       @guard = Mutex.new
 
@@ -100,13 +100,8 @@ module ActiveSupport
 
     def flush
       @guard.synchronize do
-        unless buffer.empty?
-          old_buffer = buffer
-          all_content = StringIO.new
-          old_buffer.each do |content|
-            all_content << content
-          end
-          @log.write(all_content.string)
+        buffer.each do |content|
+          @log.write(content)
         end
 
         # Important to do this even if buffer was empty or else @buffer will
@@ -127,7 +122,7 @@ module ActiveSupport
       end
 
       def buffer
-        @buffer[Thread.current] ||= []
+        @buffer[Thread.current]
       end
 
       def clear_buffer
diff --git a/activesupport/lib/active_support/log_subscriber.rb b/activesupport/lib/active_support/log_subscriber.rb
index 10675edac5..1c4dd24227 100644
--- a/activesupport/lib/active_support/log_subscriber.rb
+++ b/activesupport/lib/active_support/log_subscriber.rb
@@ -81,7 +81,7 @@ module ActiveSupport
 
       # Flush all log_subscribers' logger.
       def flush_all!
-        flushable_loggers.each(&:flush)
+        flushable_loggers.each { |log| log.flush }
       end
     end