From e31c375bc96367b9219beeff836907370c106078 Mon Sep 17 00:00:00 2001 From: Frederick Cheung Date: Wed, 10 Dec 2008 22:36:58 +0000 Subject: [PATCH] Squash memory leak when calling flush with an empty buffer --- .../lib/active_support/buffered_logger.rb | 4 +++- activesupport/test/buffered_logger_test.rb | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/activesupport/lib/active_support/buffered_logger.rb b/activesupport/lib/active_support/buffered_logger.rb index b2c863c..4614a66 100644 --- a/activesupport/lib/active_support/buffered_logger.rb +++ b/activesupport/lib/active_support/buffered_logger.rb @@ -96,9 +96,11 @@ module ActiveSupport @guard.synchronize do unless buffer.empty? old_buffer = buffer - clear_buffer @log.write(old_buffer.join) end + #important to do this even if buffer was empty or else @buffer will accumulate + #empty arrays for each request where nothing was logged + clear_buffer end end diff --git a/activesupport/test/buffered_logger_test.rb b/activesupport/test/buffered_logger_test.rb index 28dd343..d82745a 100644 --- a/activesupport/test/buffered_logger_test.rb +++ b/activesupport/test/buffered_logger_test.rb @@ -137,4 +137,10 @@ class BufferedLoggerTest < Test::Unit::TestCase assert @output.string.include?("a\nb\nc\n") assert @output.string.include?("x\ny\nz\n") end + + def test_flush_should_remove_empty_buffers + @logger.send :buffer + @logger.expects :clear_buffer + @logger.flush + end end -- 1.6.0.1