aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-06-20 14:21:23 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2012-06-20 14:21:23 -0700
commit26a4e5e60e4875e77a91fee5a9655d54f3635972 (patch)
tree1fbe0ec04e62ce40a30da524be678bf1d5b479f6
parent8edd6deae818e9686dbdeed773241cc6000508c8 (diff)
downloadrails-26a4e5e60e4875e77a91fee5a9655d54f3635972.tar.gz
rails-26a4e5e60e4875e77a91fee5a9655d54f3635972.tar.bz2
rails-26a4e5e60e4875e77a91fee5a9655d54f3635972.zip
logger is a singleton, just flush the singleton
-rw-r--r--activesupport/lib/active_support/log_subscriber.rb12
1 files changed, 1 insertions, 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