Skip to content

Commit

Permalink
Merge pull request #2595 from fluent/ignore-timeout-error-in-accept
Browse files Browse the repository at this point in the history
server helper: Ignore ETIMEDOUT error in SSL_accept. fix #2592
  • Loading branch information
repeatedly authored Sep 2, 2019
2 parents bd951f3 + 19a41bd commit a81a54e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion lib/fluent/plugin_helper/server.rb
Original file line number Diff line number Diff line change
Expand Up @@ -722,7 +722,7 @@ def try_tls_accept

return true
end
rescue Errno::EPIPE, Errno::ECONNRESET, OpenSSL::SSL::SSLError => e
rescue Errno::EPIPE, Errno::ECONNRESET, Errno::ETIMEDOUT, OpenSSL::SSL::SSLError => e
@log.trace "unexpected error before accepting TLS connection", error: e
close rescue nil
end
Expand Down

0 comments on commit a81a54e

Please sign in to comment.