Skip to content

Commit 5487ee3

Browse files
committed
Fix localhost renderer kill port
1 parent db313f1 commit 5487ee3

1 file changed

Lines changed: 18 additions & 0 deletions

File tree

react_on_rails/lib/react_on_rails/dev/server_manager.rb

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,29 @@ def default_killable_ports
8787
def configured_renderer_port_for_kill
8888
raw_port = ENV.fetch("RENDERER_PORT", nil)
8989
return raw_port.strip.to_i if valid_port_string?(raw_port)
90+
91+
local_renderer_url_port = configured_local_renderer_url_port_for_kill
92+
return local_renderer_url_port if local_renderer_url_port
93+
9094
return nil if remote_renderer_url_configured?
9195

9296
3800
9397
end
9498

99+
def configured_local_renderer_url_port_for_kill
100+
%w[REACT_RENDERER_URL RENDERER_URL].each do |var|
101+
url = ENV.fetch(var, nil)
102+
next if url.nil? || url.strip.empty? || !localhost_renderer_url?(url)
103+
next unless url.match?(URL_WITH_EXPLICIT_PORT_RE)
104+
105+
return URI.parse(url).port
106+
rescue URI::InvalidURIError
107+
next
108+
end
109+
110+
nil
111+
end
112+
95113
def remote_renderer_url_configured?
96114
%w[REACT_RENDERER_URL RENDERER_URL].any? do |var|
97115
url = ENV.fetch(var, nil)

0 commit comments

Comments
 (0)