Service and node should be structs rather than interface
This commit is contained in:
parent
d4a7deb594
commit
7aa2c82ced
@ -40,7 +40,7 @@ type httpSubscriber struct {
|
||||
topic string
|
||||
ch chan *httpSubscriber
|
||||
fn func(context.Context, *Message)
|
||||
svc registry.Service
|
||||
svc *registry.Service
|
||||
}
|
||||
|
||||
// used in brokers where there is no support for headers
|
||||
@ -219,8 +219,8 @@ func (h *httpBroker) Publish(ctx context.Context, topic string, body []byte) err
|
||||
return err
|
||||
}
|
||||
|
||||
for _, node := range s.Nodes() {
|
||||
r, err := http.Post(fmt.Sprintf("http://%s:%d%s", node.Address(), node.Port(), DefaultSubPath), "application/json", bytes.NewBuffer(b))
|
||||
for _, node := range s.Nodes {
|
||||
r, err := http.Post(fmt.Sprintf("http://%s:%d%s", node.Address, node.Port, DefaultSubPath), "application/json", bytes.NewBuffer(b))
|
||||
if err == nil {
|
||||
r.Body.Close()
|
||||
}
|
||||
@ -236,8 +236,16 @@ func (h *httpBroker) Subscribe(topic string, function func(context.Context, *Mes
|
||||
port, _ := strconv.Atoi(parts[len(parts)-1])
|
||||
|
||||
// register service
|
||||
node := registry.NewNode(h.id, host, port)
|
||||
service := registry.NewService("topic:"+topic, node)
|
||||
node := ®istry.Node{
|
||||
Id: h.id,
|
||||
Address: host,
|
||||
Port: port,
|
||||
}
|
||||
|
||||
service := ®istry.Service{
|
||||
Name: "topic:" + topic,
|
||||
Nodes: []*registry.Node{node},
|
||||
}
|
||||
|
||||
subscriber := &httpSubscriber{
|
||||
id: uuid.NewUUID().String(),
|
||||
@ -247,7 +255,7 @@ func (h *httpBroker) Subscribe(topic string, function func(context.Context, *Mes
|
||||
svc: service,
|
||||
}
|
||||
|
||||
log.Infof("Registering subscriber %s", node.Id())
|
||||
log.Infof("Registering subscriber %s", node.Id)
|
||||
if err := registry.Register(service); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
@ -159,16 +159,16 @@ func (r *rpcClient) Call(ctx context.Context, request Request, response interfac
|
||||
return errors.InternalServerError("go.micro.client", err.Error())
|
||||
}
|
||||
|
||||
if len(service.Nodes()) == 0 {
|
||||
if len(service.Nodes) == 0 {
|
||||
return errors.NotFound("go.micro.client", "Service not found")
|
||||
}
|
||||
|
||||
n := rand.Int() % len(service.Nodes())
|
||||
node := service.Nodes()[n]
|
||||
n := rand.Int() % len(service.Nodes)
|
||||
node := service.Nodes[n]
|
||||
|
||||
address := node.Address()
|
||||
if node.Port() > 0 {
|
||||
address = fmt.Sprintf("%s:%d", address, node.Port())
|
||||
address := node.Address
|
||||
if node.Port > 0 {
|
||||
address = fmt.Sprintf("%s:%d", address, node.Port)
|
||||
}
|
||||
|
||||
return r.call(ctx, address, request, response)
|
||||
|
@ -1,20 +0,0 @@
|
||||
package registry
|
||||
|
||||
type consulNode struct {
|
||||
Node string
|
||||
NodeId string
|
||||
NodeAddress string
|
||||
NodePort int
|
||||
}
|
||||
|
||||
func (c *consulNode) Id() string {
|
||||
return c.NodeId
|
||||
}
|
||||
|
||||
func (c *consulNode) Address() string {
|
||||
return c.NodeAddress
|
||||
}
|
||||
|
||||
func (c *consulNode) Port() int {
|
||||
return c.NodePort
|
||||
}
|
@ -1,6 +1,7 @@
|
||||
package registry
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"sync"
|
||||
|
||||
@ -12,7 +13,32 @@ type consulRegistry struct {
|
||||
Client *consul.Client
|
||||
|
||||
mtx sync.RWMutex
|
||||
services map[string]Service
|
||||
services map[string]*Service
|
||||
}
|
||||
|
||||
func encodeMetaData(md map[string]string) []string {
|
||||
var tags []string
|
||||
for k, v := range md {
|
||||
if b, err := json.Marshal(map[string]string{
|
||||
k: v,
|
||||
}); err == nil {
|
||||
tags = append(tags, string(b))
|
||||
}
|
||||
}
|
||||
return tags
|
||||
}
|
||||
|
||||
func decodeMetaData(tags []string) map[string]string {
|
||||
md := make(map[string]string)
|
||||
for _, tag := range tags {
|
||||
var kv map[string]string
|
||||
if err := json.Unmarshal([]byte(tag), &kv); err == nil {
|
||||
for k, v := range kv {
|
||||
md[k] = v
|
||||
}
|
||||
}
|
||||
}
|
||||
return md
|
||||
}
|
||||
|
||||
func newConsulRegistry(addrs []string, opts ...Option) Registry {
|
||||
@ -25,50 +51,53 @@ func newConsulRegistry(addrs []string, opts ...Option) Registry {
|
||||
cr := &consulRegistry{
|
||||
Address: config.Address,
|
||||
Client: client,
|
||||
services: make(map[string]Service),
|
||||
services: make(map[string]*Service),
|
||||
}
|
||||
|
||||
cr.Watch()
|
||||
return cr
|
||||
}
|
||||
|
||||
func (c *consulRegistry) Deregister(s Service) error {
|
||||
if len(s.Nodes()) == 0 {
|
||||
func (c *consulRegistry) Deregister(s *Service) error {
|
||||
if len(s.Nodes) == 0 {
|
||||
return errors.New("Require at least one node")
|
||||
}
|
||||
|
||||
node := s.Nodes()[0]
|
||||
node := s.Nodes[0]
|
||||
|
||||
_, err := c.Client.Catalog().Deregister(&consul.CatalogDeregistration{
|
||||
Node: node.Id(),
|
||||
Address: node.Address(),
|
||||
ServiceID: node.Id(),
|
||||
Node: node.Id,
|
||||
Address: node.Address,
|
||||
ServiceID: node.Id,
|
||||
}, nil)
|
||||
|
||||
return err
|
||||
}
|
||||
|
||||
func (c *consulRegistry) Register(s Service) error {
|
||||
if len(s.Nodes()) == 0 {
|
||||
func (c *consulRegistry) Register(s *Service) error {
|
||||
if len(s.Nodes) == 0 {
|
||||
return errors.New("Require at least one node")
|
||||
}
|
||||
|
||||
node := s.Nodes()[0]
|
||||
node := s.Nodes[0]
|
||||
|
||||
tags := encodeMetaData(node.MetaData)
|
||||
|
||||
_, err := c.Client.Catalog().Register(&consul.CatalogRegistration{
|
||||
Node: node.Id(),
|
||||
Address: node.Address(),
|
||||
Node: node.Id,
|
||||
Address: node.Address,
|
||||
Service: &consul.AgentService{
|
||||
ID: node.Id(),
|
||||
Service: s.Name(),
|
||||
Port: node.Port(),
|
||||
ID: node.Id,
|
||||
Service: s.Name,
|
||||
Port: node.Port,
|
||||
Tags: tags,
|
||||
},
|
||||
}, nil)
|
||||
|
||||
return err
|
||||
}
|
||||
|
||||
func (c *consulRegistry) GetService(name string) (Service, error) {
|
||||
func (c *consulRegistry) GetService(name string) (*Service, error) {
|
||||
c.mtx.RLock()
|
||||
service, ok := c.services[name]
|
||||
c.mtx.RUnlock()
|
||||
@ -82,31 +111,31 @@ func (c *consulRegistry) GetService(name string) (Service, error) {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
cs := &consulService{}
|
||||
cs := &Service{}
|
||||
|
||||
for _, s := range rsp {
|
||||
if s.ServiceName != name {
|
||||
continue
|
||||
}
|
||||
|
||||
cs.ServiceName = s.ServiceName
|
||||
cs.ServiceNodes = append(cs.ServiceNodes, &consulNode{
|
||||
Node: s.Node,
|
||||
NodeId: s.ServiceID,
|
||||
NodeAddress: s.Address,
|
||||
NodePort: s.ServicePort,
|
||||
cs.Name = s.ServiceName
|
||||
cs.Nodes = append(cs.Nodes, &Node{
|
||||
Id: s.ServiceID,
|
||||
Address: s.Address,
|
||||
Port: s.ServicePort,
|
||||
MetaData: decodeMetaData(s.ServiceTags),
|
||||
})
|
||||
}
|
||||
|
||||
return cs, nil
|
||||
}
|
||||
|
||||
func (c *consulRegistry) ListServices() ([]Service, error) {
|
||||
func (c *consulRegistry) ListServices() ([]*Service, error) {
|
||||
c.mtx.RLock()
|
||||
serviceMap := c.services
|
||||
c.mtx.RUnlock()
|
||||
|
||||
var services []Service
|
||||
var services []*Service
|
||||
|
||||
if len(serviceMap) > 0 {
|
||||
for _, service := range services {
|
||||
@ -121,36 +150,12 @@ func (c *consulRegistry) ListServices() ([]Service, error) {
|
||||
}
|
||||
|
||||
for service, _ := range rsp {
|
||||
services = append(services, &consulService{ServiceName: service})
|
||||
services = append(services, &Service{Name: service})
|
||||
}
|
||||
|
||||
return services, nil
|
||||
}
|
||||
|
||||
func (c *consulRegistry) NewService(name string, nodes ...Node) Service {
|
||||
var snodes []*consulNode
|
||||
|
||||
for _, node := range nodes {
|
||||
if n, ok := node.(*consulNode); ok {
|
||||
snodes = append(snodes, n)
|
||||
}
|
||||
}
|
||||
|
||||
return &consulService{
|
||||
ServiceName: name,
|
||||
ServiceNodes: snodes,
|
||||
}
|
||||
}
|
||||
|
||||
func (c *consulRegistry) NewNode(id, address string, port int) Node {
|
||||
return &consulNode{
|
||||
Node: id,
|
||||
NodeId: id,
|
||||
NodeAddress: address,
|
||||
NodePort: port,
|
||||
}
|
||||
}
|
||||
|
||||
func (c *consulRegistry) Watch() {
|
||||
newConsulWatcher(c)
|
||||
}
|
||||
|
@ -1,20 +0,0 @@
|
||||
package registry
|
||||
|
||||
type consulService struct {
|
||||
ServiceName string
|
||||
ServiceNodes []*consulNode
|
||||
}
|
||||
|
||||
func (c *consulService) Name() string {
|
||||
return c.ServiceName
|
||||
}
|
||||
|
||||
func (c *consulService) Nodes() []Node {
|
||||
var nodes []Node
|
||||
|
||||
for _, node := range c.ServiceNodes {
|
||||
nodes = append(nodes, node)
|
||||
}
|
||||
|
||||
return nodes
|
||||
}
|
@ -37,20 +37,20 @@ func (cw *consulWatcher) serviceHandler(idx uint64, data interface{}) {
|
||||
return
|
||||
}
|
||||
|
||||
cs := &consulService{}
|
||||
cs := &Service{}
|
||||
|
||||
for _, e := range entries {
|
||||
cs.ServiceName = e.Service.Service
|
||||
cs.ServiceNodes = append(cs.ServiceNodes, &consulNode{
|
||||
Node: e.Node.Node,
|
||||
NodeId: e.Service.ID,
|
||||
NodeAddress: e.Node.Address,
|
||||
NodePort: e.Service.Port,
|
||||
cs.Name = e.Service.Service
|
||||
cs.Nodes = append(cs.Nodes, &Node{
|
||||
Id: e.Service.ID,
|
||||
Address: e.Node.Address,
|
||||
Port: e.Service.Port,
|
||||
MetaData: decodeMetaData(e.Service.Tags),
|
||||
})
|
||||
}
|
||||
|
||||
cw.Registry.mtx.Lock()
|
||||
cw.Registry.services[cs.ServiceName] = cs
|
||||
cw.Registry.services[cs.Name] = cs
|
||||
cw.Registry.mtx.Unlock()
|
||||
}
|
||||
|
||||
|
@ -16,22 +16,22 @@ type kregistry struct {
|
||||
namespace string
|
||||
|
||||
mtx sync.RWMutex
|
||||
services map[string]registry.Service
|
||||
services map[string]*registry.Service
|
||||
}
|
||||
|
||||
func (c *kregistry) Watch() {
|
||||
newWatcher(c)
|
||||
}
|
||||
|
||||
func (c *kregistry) Deregister(s registry.Service) error {
|
||||
func (c *kregistry) Deregister(s *registry.Service) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (c *kregistry) Register(s registry.Service) error {
|
||||
func (c *kregistry) Register(s *registry.Service) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (c *kregistry) GetService(name string) (registry.Service, error) {
|
||||
func (c *kregistry) GetService(name string) (*registry.Service, error) {
|
||||
c.mtx.RLock()
|
||||
svc, ok := c.services[name]
|
||||
c.mtx.RUnlock()
|
||||
@ -51,23 +51,26 @@ func (c *kregistry) GetService(name string) (registry.Service, error) {
|
||||
return nil, fmt.Errorf("Service not found")
|
||||
}
|
||||
|
||||
ks := &service{name: name}
|
||||
ks := ®istry.Service{
|
||||
Name: name,
|
||||
}
|
||||
|
||||
for _, item := range services.Items {
|
||||
ks.nodes = append(ks.nodes, &node{
|
||||
address: item.Spec.PortalIP,
|
||||
port: item.Spec.Ports[0].Port,
|
||||
ks.Nodes = append(ks.Nodes, ®istry.Node{
|
||||
Address: item.Spec.PortalIP,
|
||||
Port: item.Spec.Ports[0].Port,
|
||||
})
|
||||
}
|
||||
|
||||
return ks, nil
|
||||
}
|
||||
|
||||
func (c *kregistry) ListServices() ([]registry.Service, error) {
|
||||
func (c *kregistry) ListServices() ([]*registry.Service, error) {
|
||||
c.mtx.RLock()
|
||||
serviceMap := c.services
|
||||
c.mtx.RUnlock()
|
||||
|
||||
var services []registry.Service
|
||||
var services []*registry.Service
|
||||
|
||||
if len(serviceMap) > 0 {
|
||||
for _, service := range serviceMap {
|
||||
@ -86,37 +89,14 @@ func (c *kregistry) ListServices() ([]registry.Service, error) {
|
||||
continue
|
||||
}
|
||||
|
||||
services = append(services, &service{
|
||||
name: svc.ObjectMeta.Labels["name"],
|
||||
services = append(services, ®istry.Service{
|
||||
Name: svc.ObjectMeta.Labels["name"],
|
||||
})
|
||||
}
|
||||
|
||||
return services, nil
|
||||
}
|
||||
|
||||
func (c *kregistry) NewService(name string, nodes ...registry.Node) registry.Service {
|
||||
var snodes []*node
|
||||
|
||||
for _, nod := range nodes {
|
||||
if n, ok := nod.(*node); ok {
|
||||
snodes = append(snodes, n)
|
||||
}
|
||||
}
|
||||
|
||||
return &service{
|
||||
name: name,
|
||||
nodes: snodes,
|
||||
}
|
||||
}
|
||||
|
||||
func (c *kregistry) NewNode(id, address string, port int) registry.Node {
|
||||
return &node{
|
||||
id: id,
|
||||
address: address,
|
||||
port: port,
|
||||
}
|
||||
}
|
||||
|
||||
func NewRegistry(addrs []string, opts ...registry.Option) registry.Registry {
|
||||
host := "http://" + os.Getenv("KUBERNETES_RO_SERVICE_HOST") + ":" + os.Getenv("KUBERNETES_RO_SERVICE_PORT")
|
||||
if len(addrs) > 0 {
|
||||
@ -130,7 +110,7 @@ func NewRegistry(addrs []string, opts ...registry.Option) registry.Registry {
|
||||
kr := &kregistry{
|
||||
client: client,
|
||||
namespace: "default",
|
||||
services: make(map[string]registry.Service),
|
||||
services: make(map[string]*registry.Service),
|
||||
}
|
||||
|
||||
kr.Watch()
|
||||
|
@ -1,19 +0,0 @@
|
||||
package kubernetes
|
||||
|
||||
type node struct {
|
||||
id string
|
||||
address string
|
||||
port int
|
||||
}
|
||||
|
||||
func (n *node) Id() string {
|
||||
return n.id
|
||||
}
|
||||
|
||||
func (n *node) Address() string {
|
||||
return n.address
|
||||
}
|
||||
|
||||
func (n *node) Port() int {
|
||||
return n.port
|
||||
}
|
@ -1,24 +0,0 @@
|
||||
package kubernetes
|
||||
|
||||
import (
|
||||
"github.com/myodc/go-micro/registry"
|
||||
)
|
||||
|
||||
type service struct {
|
||||
name string
|
||||
nodes []*node
|
||||
}
|
||||
|
||||
func (s *service) Name() string {
|
||||
return s.name
|
||||
}
|
||||
|
||||
func (s *service) Nodes() []registry.Node {
|
||||
var nodes []registry.Node
|
||||
|
||||
for _, node := range s.nodes {
|
||||
nodes = append(nodes, node)
|
||||
}
|
||||
|
||||
return nodes
|
||||
}
|
@ -8,6 +8,7 @@ import (
|
||||
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
|
||||
"github.com/GoogleCloudPlatform/kubernetes/pkg/proxy/config"
|
||||
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
|
||||
"github.com/myodc/go-micro/registry"
|
||||
)
|
||||
|
||||
type watcher struct {
|
||||
@ -27,12 +28,12 @@ func (k *watcher) OnUpdate(services []api.Service) {
|
||||
activeServices.Insert(name)
|
||||
serviceIP := net.ParseIP(svc.Spec.PortalIP)
|
||||
|
||||
ks := &service{
|
||||
name: name,
|
||||
nodes: []*node{
|
||||
&node{
|
||||
address: serviceIP.String(),
|
||||
port: svc.Spec.Ports[0].Port,
|
||||
ks := ®istry.Service{
|
||||
Name: name,
|
||||
Nodes: []*registry.Node{
|
||||
®istry.Node{
|
||||
Address: serviceIP.String(),
|
||||
Port: svc.Spec.Ports[0].Port,
|
||||
},
|
||||
},
|
||||
}
|
||||
|
@ -1,11 +0,0 @@
|
||||
package registry
|
||||
|
||||
type Node interface {
|
||||
Id() string
|
||||
Address() string
|
||||
Port() int
|
||||
}
|
||||
|
||||
func NewNode(id, address string, port int) Node {
|
||||
return DefaultRegistry.NewNode(id, address, port)
|
||||
}
|
@ -1,12 +1,23 @@
|
||||
package registry
|
||||
|
||||
type Registry interface {
|
||||
Register(Service) error
|
||||
Deregister(Service) error
|
||||
GetService(string) (Service, error)
|
||||
ListServices() ([]Service, error)
|
||||
NewService(string, ...Node) Service
|
||||
NewNode(string, string, int) Node
|
||||
Register(*Service) error
|
||||
Deregister(*Service) error
|
||||
GetService(string) (*Service, error)
|
||||
ListServices() ([]*Service, error)
|
||||
}
|
||||
|
||||
type Service struct {
|
||||
Name string
|
||||
MetaData map[string]string
|
||||
Nodes []*Node
|
||||
}
|
||||
|
||||
type Node struct {
|
||||
Id string
|
||||
Address string
|
||||
Port int
|
||||
MetaData map[string]string
|
||||
}
|
||||
|
||||
type options struct{}
|
||||
@ -21,18 +32,18 @@ func NewRegistry(addrs []string, opt ...Option) Registry {
|
||||
return newConsulRegistry(addrs, opt...)
|
||||
}
|
||||
|
||||
func Register(s Service) error {
|
||||
func Register(s *Service) error {
|
||||
return DefaultRegistry.Register(s)
|
||||
}
|
||||
|
||||
func Deregister(s Service) error {
|
||||
func Deregister(s *Service) error {
|
||||
return DefaultRegistry.Deregister(s)
|
||||
}
|
||||
|
||||
func GetService(name string) (Service, error) {
|
||||
func GetService(name string) (*Service, error) {
|
||||
return DefaultRegistry.GetService(name)
|
||||
}
|
||||
|
||||
func ListServices() ([]Service, error) {
|
||||
func ListServices() ([]*Service, error) {
|
||||
return DefaultRegistry.ListServices()
|
||||
}
|
||||
|
@ -1,10 +0,0 @@
|
||||
package registry
|
||||
|
||||
type Service interface {
|
||||
Name() string
|
||||
Nodes() []Node
|
||||
}
|
||||
|
||||
func NewService(name string, nodes ...Node) Service {
|
||||
return DefaultRegistry.NewService(name, nodes...)
|
||||
}
|
@ -93,10 +93,18 @@ func Run() error {
|
||||
}
|
||||
|
||||
// register service
|
||||
node := registry.NewNode(Id, host, port)
|
||||
service := registry.NewService(Name, node)
|
||||
node := ®istry.Node{
|
||||
Id: Id,
|
||||
Address: host,
|
||||
Port: port,
|
||||
}
|
||||
|
||||
log.Infof("Registering node: %s", node.Id())
|
||||
service := ®istry.Service{
|
||||
Name: Name,
|
||||
Nodes: []*registry.Node{node},
|
||||
}
|
||||
|
||||
log.Infof("Registering node: %s", node.Id)
|
||||
|
||||
err := registry.Register(service)
|
||||
if err != nil {
|
||||
@ -107,7 +115,7 @@ func Run() error {
|
||||
signal.Notify(ch, syscall.SIGTERM, syscall.SIGINT, syscall.SIGKILL)
|
||||
log.Infof("Received signal %s", <-ch)
|
||||
|
||||
log.Infof("Deregistering %s", node.Id())
|
||||
log.Infof("Deregistering %s", node.Id)
|
||||
registry.Deregister(service)
|
||||
|
||||
return Stop()
|
||||
|
Loading…
Reference in New Issue
Block a user