From 8385211fa21af561577da7c5a15d83f9ee440cbb Mon Sep 17 00:00:00 2001 From: Joachim Bauch Date: Tue, 27 Feb 2024 08:50:37 +0100 Subject: [PATCH 1/2] Need to start DNS monitor. --- server/main.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/server/main.go b/server/main.go index 53da6a4..5d058e3 100644 --- a/server/main.go +++ b/server/main.go @@ -160,6 +160,9 @@ func main() { if err != nil { log.Fatal("Could not create DNS monitor: ", err) } + if err := dnsMonitor.Start(); err != nil { + log.Fatal("Could not start DNS monitor: ", err) + } defer dnsMonitor.Stop() etcdClient, err := signaling.NewEtcdClient(config, "mcu") From 1f8b536c8a79837f6a4c03c001955670e05e0b7f Mon Sep 17 00:00:00 2001 From: Joachim Bauch Date: Tue, 27 Feb 2024 08:52:20 +0100 Subject: [PATCH 2/2] Split port from hostname in full urls. --- dns_monitor.go | 8 ++++---- dns_monitor_test.go | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dns_monitor.go b/dns_monitor.go index 59f7f2e..072e01c 100644 --- a/dns_monitor.go +++ b/dns_monitor.go @@ -197,11 +197,11 @@ func (m *DnsMonitor) Add(target string, callback DnsMonitorCallback) (*DnsMonito } hostname = parsed.Host } else { - // Hostname with optional port passed. + // Hostname only passed. hostname = target - if h, _, err := net.SplitHostPort(target); err == nil { - hostname = h - } + } + if h, _, err := net.SplitHostPort(hostname); err == nil { + hostname = h } m.mu.Lock() diff --git a/dns_monitor_test.go b/dns_monitor_test.go index eedae1c..5844501 100644 --- a/dns_monitor_test.go +++ b/dns_monitor_test.go @@ -240,7 +240,7 @@ func TestDnsMonitor(t *testing.T) { rec1 := newDnsMonitorReceiverForTest(t) rec1.Expect(ips1, ips1, nil, nil) - entry1, err := monitor.Add("https://foo", rec1.OnLookup) + entry1, err := monitor.Add("https://foo:12345", rec1.OnLookup) if err != nil { t.Fatal(err) }