Remove Port from registry
This commit is contained in:
@@ -158,7 +158,7 @@ func newNode(n *network) (*node, error) {
|
||||
// register with the network id
|
||||
Name: n.Name(),
|
||||
Nodes: []*registry.Node{
|
||||
{Id: node.id, Address: addr, Port: port},
|
||||
{Id: node.id, Address: node.address},
|
||||
},
|
||||
}); err != nil {
|
||||
node.Close()
|
||||
|
@@ -3,7 +3,6 @@ package mucp
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"io"
|
||||
"os"
|
||||
"strings"
|
||||
@@ -157,11 +156,7 @@ func (p *Proxy) getRoute(service string) ([]string, error) {
|
||||
|
||||
for _, service := range services {
|
||||
for _, node := range service.Nodes {
|
||||
addr := node.Address
|
||||
if node.Port > 0 {
|
||||
addr = fmt.Sprintf("%s:%d", node.Address, node.Port)
|
||||
}
|
||||
addrs = append(addrs, addr)
|
||||
addrs = append(addrs, node.Address)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -2,8 +2,6 @@
|
||||
package registry
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/micro/go-micro/network/resolver"
|
||||
"github.com/micro/go-micro/registry"
|
||||
)
|
||||
@@ -29,13 +27,8 @@ func (r *Resolver) Resolve(id string) ([]*resolver.Record, error) {
|
||||
|
||||
for _, service := range services {
|
||||
for _, node := range service.Nodes {
|
||||
addr := node.Address
|
||||
// such a hack
|
||||
if node.Port > 0 {
|
||||
addr = fmt.Sprintf("%s:%d", node.Address, node.Port)
|
||||
}
|
||||
records = append(records, &resolver.Record{
|
||||
Address: addr,
|
||||
Address: node.Address,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
@@ -98,13 +98,9 @@ func (r *router) addServiceRoutes(reg registry.Registry, network string, metric
|
||||
|
||||
// range over the flat slice of nodes
|
||||
for _, node := range nodes {
|
||||
gateway := node.Address
|
||||
if node.Port > 0 {
|
||||
gateway = fmt.Sprintf("%s:%d", node.Address, node.Port)
|
||||
}
|
||||
route := Route{
|
||||
Destination: service.Name,
|
||||
Gateway: gateway,
|
||||
Gateway: node.Address,
|
||||
Router: r.opts.Address,
|
||||
Network: r.opts.Network,
|
||||
Metric: metric,
|
||||
|
Reference in New Issue
Block a user