Skip to content

Commit 9436af9

Browse files
committed
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+
1 parent a715e05 commit 9436af9

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

lib/webpacker/dev_server.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def initialize(config)
1313

1414
def running?
1515
if config.dev_server.present?
16-
Socket.tcp(host, port, connect_timeout: connect_timeout).close
16+
Timeout.timeout(connect_timeout) { Socket.tcp(host, port).close }
1717
true
1818
else
1919
false

lib/webpacker/dev_server_runner.rb

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
require "shellwords"
22
require "socket"
3+
require "timeout"
34
require "webpacker/configuration"
45
require "webpacker/dev_server"
56
require "webpacker/runner"

0 commit comments

Comments
 (0)