1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

[ruby/net-smtp] Replace Timeout.timeout with socket timeout

Timeout.timeout is inefficient since it spins up a new thread for
each invocation, use Socket.tcp's connect_timeout option instead

https://github.com/ruby/net-smtp/commit/6ae4a59f05
This commit is contained in:
mohamed 2021-02-15 09:36:50 -08:00 committed by Hiroshi SHIBATA
parent 4c8cce5b8a
commit ff931d0336

View file

@ -588,7 +588,12 @@ module Net
private
def tcp_socket(address, port)
TCPSocket.open address, port
begin
Socket.tcp address, port, nil, nil, connect_timeout: @open_timeout
rescue Errno::ETIMEDOUT #raise Net:OpenTimeout instead for compatibility with previous versions
raise Net::OpenTimeout, "Timeout to open TCP connection to "\
"#{address}:#{port} (exceeds #{@open_timeout} seconds)"
end
end
def do_start(helo_domain, user, secret, authtype)
@ -597,9 +602,7 @@ module Net
check_auth_method(authtype || DEFAULT_AUTH_TYPE)
check_auth_args user, secret
end
s = Timeout.timeout(@open_timeout, Net::OpenTimeout) do
tcp_socket(@address, @port)
end
s = tcp_socket(@address, @port)
logging "Connection opened: #{@address}:#{@port}"
@socket = new_internet_message_io(tls? ? tlsconnect(s, @ssl_context_tls) : s)
check_response critical { recv_response() }