From 60fe266c9ea5777f5f0149a3bdb9cf8e02f1ec81 Mon Sep 17 00:00:00 2001 From: isaac-hammes Date: Thu, 2 Mar 2023 10:56:40 -0800 Subject: [PATCH] (maint) Use timeout builtin to TCPSocket when opening sockets. --- lib/vmpooler/api/helpers.rb | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/lib/vmpooler/api/helpers.rb b/lib/vmpooler/api/helpers.rb index 136b5f1..93d571b 100644 --- a/lib/vmpooler/api/helpers.rb +++ b/lib/vmpooler/api/helpers.rb @@ -540,17 +540,15 @@ module Vmpooler }, kind: :client ) do - Timeout.timeout(timeout) do - target_host = host - target_host = "#{host}.#{domain}" if domain - span = OpenTelemetry::Trace.current_span - span.set_attribute('net.peer.name', target_host) - sock = TCPSocket.new target_host, port - begin - yield sock if block_given? - ensure - sock.close - end + target_host = host + target_host = "#{host}.#{domain}" if domain + span = OpenTelemetry::Trace.current_span + span.set_attribute('net.peer.name', target_host) + sock = TCPSocket.new(target_host, port, connect_timeout: timeout) + begin + yield sock if block_given? + ensure + sock.close end end end