@@ -96,9 +96,12 @@ 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 activesupport/lib/active_support/buffered_logger.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 activesupport/test/buffered_logger_test.rb d45e2c733d471b0c87f7cf721376ca4802450121 Frederick Cheung frederick.cheung@gmail.com http://github.com/rails/rails/commit/9f69ff12d44c4d1e475fd6efede120ccedba3b3e 9f69ff12d44c4d1e475fd6efede120ccedba3b3e 2008-12-10T15:07:34-08:00 2008-12-10T14:36:58-08:00 Squash memory leak when calling flush with an empty buffer [#1552 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> 54736917ef42c4c84f04b03c703a3db7aca43da6 Jeremy Kemper jeremy@bitsweat.net