make connect_timeout work with DNS resolution

Before it could timeout connection process, but still wait for DNS resolution for long time. It's possible to interrupt addrinfo in ruby 3+
rails · Jul 16, 2024 · 9436af9 · 9436af9
1 parent a715e05
commit 9436af9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/lib/webpacker/dev_server.rb b/lib/webpacker/dev_server.rb
@@ -13,7 +13,7 @@ def initialize(config)
 
   def running?
     if config.dev_server.present?
-      Socket.tcp(host, port, connect_timeout: connect_timeout).close
+      Timeout.timeout(connect_timeout) { Socket.tcp(host, port).close }
       true
     else
       false

diff --git a/lib/webpacker/dev_server_runner.rb b/lib/webpacker/dev_server_runner.rb
@@ -1,5 +1,6 @@
 require "shellwords"
 require "socket"
+require "timeout"
 require "webpacker/configuration"
 require "webpacker/dev_server"
 require "webpacker/runner"