diff options
author | nagachika <nagachika@ruby-lang.org> | 2021-06-10 16:01:53 +0900 |
---|---|---|
committer | nagachika <nagachika@ruby-lang.org> | 2021-06-10 16:01:53 +0900 |
commit | ced669aed0de19090d1ba85eb9881becb693a735 (patch) | |
tree | 8060847e8228f6972295a11e844ddd2e73b3078f /lib | |
parent | d4f4ae599f650feb0a9da6fa486ce425dbe8a81a (diff) |
merge revision(s) a86c6cb34df0c44973efe6578ba1cd9150af22cf:
[ruby/net-ftp] 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
when we aren't using SOCKS (we can't replace Timeout.timeout
for SOCKS yet since SOCKSSocket doesn't have a connect_timeout
option).
https://github.com/ruby/net-ftp/commit/d65910132f
---
lib/net/ftp.rb | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
Diffstat (limited to 'lib')
-rw-r--r-- | lib/net/ftp.rb | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb index 5e3e181c16..9e57cb363f 100644 --- a/lib/net/ftp.rb +++ b/lib/net/ftp.rb @@ -330,14 +330,19 @@ module Net # SOCKS_SERVER, then a SOCKSSocket is returned, else a Socket is # returned. def open_socket(host, port) # :nodoc: - return Timeout.timeout(@open_timeout, OpenTimeout) { - if defined? SOCKSSocket and ENV["SOCKS_SERVER"] - @passive = true + if defined? SOCKSSocket and ENV["SOCKS_SERVER"] + @passive = true + Timeout.timeout(@open_timeout, OpenTimeout) do SOCKSSocket.open(host, port) - else - Socket.tcp(host, port) end - } + else + begin + Socket.tcp host, 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 "\ + "#{host}:#{port} (exceeds #{@open_timeout} seconds)" + end + end end private :open_socket |