Merge pull request #2861 from fluent/server-change-sslerror-log-level

server helper: Change SSLError log level to warn in accept
fluent · Mar 5, 2020 · 6e6aa02 · 6e6aa02
2 parents 33f13cb + 244c030
commit 6e6aa02
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/lib/fluent/plugin_helper/server.rb b/lib/fluent/plugin_helper/server.rb
@@ -706,9 +706,13 @@ def try_tls_accept
 
                 return true
               end
-            rescue Errno::EPIPE, Errno::ECONNRESET, Errno::ETIMEDOUT, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, OpenSSL::SSL::SSLError => e
+            rescue Errno::EPIPE, Errno::ECONNRESET, Errno::ETIMEDOUT, Errno::ECONNREFUSED, Errno::EHOSTUNREACH => e
               @log.trace "unexpected error before accepting TLS connection", error: e
               close rescue nil
+            rescue OpenSSL::SSL::SSLError => e
+              # Use same log level as on_readable
+              @log.warn "unexpected error before accepting TLS connection by OpenSSL", error: e
+              close rescue nil
             end
 
             false