From 26a4e5e60e4875e77a91fee5a9655d54f3635972 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Wed, 20 Jun 2012 14:21:23 -0700 Subject: logger is a singleton, just flush the singleton --- activesupport/lib/active_support/log_subscriber.rb | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/activesupport/lib/active_support/log_subscriber.rb b/activesupport/lib/active_support/log_subscriber.rb index 384c56cd5a..e5b4ca2738 100644 --- a/activesupport/lib/active_support/log_subscriber.rb +++ b/activesupport/lib/active_support/log_subscriber.rb @@ -58,7 +58,6 @@ module ActiveSupport def attach_to(namespace, log_subscriber=new, notifier=ActiveSupport::Notifications) log_subscribers << log_subscriber - @@flushable_loggers = nil log_subscriber.public_methods(false).each do |event| next if %w{ start finish }.include?(event.to_s) @@ -71,18 +70,9 @@ module ActiveSupport @@log_subscribers ||= [] end - def flushable_loggers - @@flushable_loggers ||= begin - loggers = log_subscribers.map(&:logger) - loggers.uniq! - loggers.select! { |l| l.respond_to?(:flush) } - loggers - end - end - # Flush all log_subscribers' logger. def flush_all! - flushable_loggers.each { |log| log.flush } + logger.flush if logger.respond_to?(:flush) end end -- cgit v1.2.3