From 006b4fc73475741345704818e9bdcc47e143a4b6 Mon Sep 17 00:00:00 2001 From: Xuanzhong Wei Date: Sat, 18 Aug 2018 15:50:22 +0900 Subject: [PATCH] fix: prevent data to be re-sent when closing connection Signed-off-by: Xuanzhong Wei --- lib/fluent/logger/fluent_logger.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/fluent/logger/fluent_logger.rb b/lib/fluent/logger/fluent_logger.rb index b974265..1f24ab3 100644 --- a/lib/fluent/logger/fluent_logger.rb +++ b/lib/fluent/logger/fluent_logger.rb @@ -225,15 +225,15 @@ def write(msg) end begin - send_data(@pending) + data_to_send = @pending @pending = nil + send_data(data_to_send) true rescue => e set_last_error(e) if pending_bytesize > @limit @logger.error("FluentLogger: Can't send logs to #{connection_string}: #{$!}") - call_buffer_overflow_handler(@pending) - @pending = nil + call_buffer_overflow_handler(data_to_send) end @con.close if connect? @con = nil