From d0755b981470901dc644550f1857f48e7bae6e8a Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Thu, 4 Oct 2007 19:52:10 +0000 Subject: Disabling auto_flushing still flushes when the buffer hits a maximum size, as a failsafe against memory-gobbling. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7739 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activesupport/lib/active_support/buffered_logger.rb | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'activesupport/lib/active_support') diff --git a/activesupport/lib/active_support/buffered_logger.rb b/activesupport/lib/active_support/buffered_logger.rb index 08e71e5b8c..e666b7f0ed 100644 --- a/activesupport/lib/active_support/buffered_logger.rb +++ b/activesupport/lib/active_support/buffered_logger.rb @@ -11,6 +11,8 @@ module ActiveSupport end include Severity + MAX_BUFFER_SIZE = 1000 + # Set to false to disable the silencer cattr_accessor :silencer self.silencer = true @@ -57,7 +59,7 @@ module ActiveSupport # Ensures that the original message is not mutated. message = "#{message}\n" unless message[-1] == ?\n @buffer << message - auto_flush if auto_flushing + auto_flush message end @@ -78,16 +80,13 @@ module ActiveSupport # never auto-flush. If you turn auto-flushing off, be sure to regularly # flush the log yourself -- it will eat up memory until you do. def auto_flushing=(period) - case period - when true - @auto_flushing = 1 - when 0 - @auto_flushing = false - when false, nil, Integer - @auto_flushing = period - else - raise ArgumentError, "Unrecognized auto_flushing period: #{period.inspect}" - end + @auto_flushing = + case period + when true; 1 + when false, nil, 0; MAX_BUFFER_SIZE + when Integer; period + else raise ArgumentError, "Unrecognized auto_flushing period: #{period.inspect}" + end end def flush -- cgit v1.2.3