unistack-org/micro-server-grpc
4
0
Fork 2
Code Issues 3 Pull Requests Actions Packages Projects Releases 48 Wiki Activity

bunch of other ipv6 fixes

Browse Source 
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
Василий Толстов 2019-07-18 00:18:40 +03:00
parent 5aad839816
commit c0e32da83e
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
grpc.go
View File

@ -22,6 +22,7 @@ import (
"github.com/micro/go-micro/util/addr" "github.com/micro/go-micro/util/addr"
mgrpc "github.com/micro/go-micro/util/grpc" mgrpc "github.com/micro/go-micro/util/grpc"
"github.com/micro/go-micro/util/log" "github.com/micro/go-micro/util/log"
mnet "github.com/micro/go-micro/util/net"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"
@ -519,15 +520,12 @@ func (g *grpcServer) Register() error {
advt = config.Address advt = config.Address
} }
if idx := strings.Count(advt, ":"); idx > 1 { if cnt := strings.Count(advt, ":"); cnt >= 1 {
// ipv6 address in format [host]:port or ipv4 host:port // ipv6 address in format [host]:port or ipv4 host:port
host, port, err = net.SplitHostPort(advt) host, port, err = net.SplitHostPort(advt)
if err != nil { if err != nil {
return err return err
} }
if host == "::" {
host = fmt.Sprintf("[%s]", host)
}
} else { } else {
host = advt host = advt
} }
@ -540,7 +538,7 @@ func (g *grpcServer) Register() error {
// register service // register service
node := &registry.Node{ node := &registry.Node{
Id: config.Name + "-" + config.Id, Id: config.Name + "-" + config.Id,
Address: fmt.Sprintf("%s:%s", addr, port), Address: mnet.HostPort(addr, port),
Metadata: config.Metadata, Metadata: config.Metadata,
} }
@ -649,15 +647,12 @@ func (g *grpcServer) Deregister() error {
advt = config.Address advt = config.Address
} }
if idx := strings.Count(advt, ":"); idx > 1 { if cnt := strings.Count(advt, ":"); cnt >= 1 {
// ipv6 address in format [host]:port or ipv4 host:port // ipv6 address in format [host]:port or ipv4 host:port
host, port, err = net.SplitHostPort(advt) host, port, err = net.SplitHostPort(advt)
if err != nil { if err != nil {
return err return err
} }
if host == "::" {
host = fmt.Sprintf("[%s]", host)
}
} else { } else {
host = advt host = advt
} }
@ -669,7 +664,7 @@ func (g *grpcServer) Deregister() error {
node := &registry.Node{ node := &registry.Node{
Id: config.Name + "-" + config.Id, Id: config.Name + "-" + config.Id,
Address: fmt.Sprintf("%s:%s", addr, port), Address: mnet.HostPort(addr, port),
} }
service := &registry.Service{ service := &registry.Service{