From 03ae8738533f27953adeb8c3d443899d7f03d504 Mon Sep 17 00:00:00 2001 From: Masahiro Nakagawa Date: Fri, 27 Jul 2018 16:23:38 +0900 Subject: [PATCH] server-helper: Fix invalid 'close' call in error Signed-off-by: Masahiro Nakagawa --- lib/fluent/plugin_helper/server.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/fluent/plugin_helper/server.rb b/lib/fluent/plugin_helper/server.rb index 2a1435f339..035ffecf23 100644 --- a/lib/fluent/plugin_helper/server.rb +++ b/lib/fluent/plugin_helper/server.rb @@ -600,7 +600,7 @@ def on_read_without_connection(data) rescue => e @log.error "unexpected error on reading data", host: @callback_connection.remote_host, port: @callback_connection.remote_port, error: e @log.error_backtrace - close(true) rescue nil + close rescue nil raise if @under_plugin_development end @@ -609,7 +609,7 @@ def on_read_with_connection(data) rescue => e @log.error "unexpected error on reading data", host: @callback_connection.remote_host, port: @callback_connection.remote_port, error: e @log.error_backtrace - close(true) rescue nil + close rescue nil raise if @under_plugin_development end @@ -756,7 +756,7 @@ def on_read_without_connection(data) rescue => e @log.error "unexpected error on reading data", host: @callback_connection.remote_host, port: @callback_connection.remote_port, error: e @log.error_backtrace - close(true) rescue nil + close rescue nil raise if @under_plugin_development end @@ -765,7 +765,7 @@ def on_read_with_connection(data) rescue => e @log.error "unexpected error on reading data", host: @callback_connection.remote_host, port: @callback_connection.remote_port, error: e @log.error_backtrace - close(true) rescue nil + close rescue nil raise if @under_plugin_development end