status-im/consul
2
0
Fork 0
mirror of https://github.com/status-im/consul.git synced 2025-01-09 13:26:07 +00:00
Code Issues Projects Releases Wiki Activity

fix(peering): add missing grpc_tls_port for server address reconciliation (#14944)

Browse Source
This commit is contained in:
cskh 2022-10-11 10:56:29 -04:00 committed by GitHub
parent 2bb2846790
commit e0356e1502
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
agent/consul/autopilotevents/ready_servers_events.go
View File

@ -310,6 +310,14 @@ func (r *ReadyServersEventPublisher) getGRPCPort(srv *autopilot.ServerState) int
if err != nil || ns == nil || ns.Meta == nil { if err != nil || ns == nil || ns.Meta == nil {
return 0 return 0
} }
if str, ok := ns.Meta["grpc_tls_port"]; ok {
grpcPort, err := strconv.Atoi(str)
if err == nil {
return grpcPort
}
}
if str, ok := ns.Meta["grpc_port"]; ok { if str, ok := ns.Meta["grpc_port"]; ok {
grpcPort, err := strconv.Atoi(str) grpcPort, err := strconv.Atoi(str)
if err == nil { if err == nil {