diff options
| author | Frederick Cheung <frederick.cheung@gmail.com> | 2008-12-10 22:36:58 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-12-10 15:07:34 -0800 |
| commit | 9f69ff12d44c4d1e475fd6efede120ccedba3b3e (patch) | |
| tree | 54736917ef42c4c84f04b03c703a3db7aca43da6 /activesupport/lib | |
| parent | d45e2c733d471b0c87f7cf721376ca4802450121 (diff) | |
| download | rails-9f69ff12d44c4d1e475fd6efede120ccedba3b3e.tar.gz rails-9f69ff12d44c4d1e475fd6efede120ccedba3b3e.tar.bz2 rails-9f69ff12d44c4d1e475fd6efede120ccedba3b3e.zip | |
Squash memory leak when calling flush with an empty buffer
[#1552 state:committed]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/buffered_logger.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/buffered_logger.rb b/activesupport/lib/active_support/buffered_logger.rb index b2c863c893..445d8edf47 100644 --- a/activesupport/lib/active_support/buffered_logger.rb +++ b/activesupport/lib/active_support/buffered_logger.rb @@ -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 |