unistack-org/micro
4
0
Fork 3
Code Issues 18 Pull Requests 1 Actions Packages Projects Releases 264 Wiki Activity

registry/mdns: fix nil host bug (#1703)

Browse Source
This commit is contained in:
ben-toogood 2020-06-15 16:13:45 +01:00 committed by GitHub
parent a5df913926
commit 1179d7e89a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
registry/mdns_registry.go
View File

@ -563,9 +563,7 @@ func (m *mdnsWatcher) Next() (*Result, error) {
if len(m.wo.Service) > 0 && txt.Service != m.wo.Service { if len(m.wo.Service) > 0 && txt.Service != m.wo.Service {
continue continue
} }
var action string var action string
if e.TTL == 0 { if e.TTL == 0 {
action = "delete" action = "delete"
} else { } else {
@ -584,9 +582,18 @@ func (m *mdnsWatcher) Next() (*Result, error) {
continue continue
} }
var addr string
if len(e.AddrV4) > 0 {
addr = e.AddrV4.String()
} else if len(e.AddrV6) > 0 {
addr = "[" + e.AddrV6.String() + "]"
} else {
addr = e.Addr.String()
}
service.Nodes = append(service.Nodes, &Node{ service.Nodes = append(service.Nodes, &Node{
Id: strings.TrimSuffix(e.Name, suffix), Id: strings.TrimSuffix(e.Name, suffix),
Address: fmt.Sprintf("%s:%d", e.AddrV4.String(), e.Port), Address: fmt.Sprintf("%s:%d", addr, e.Port),
Metadata: txt.Metadata, Metadata: txt.Metadata,
}) })