1
0
mirror of https://github.com/go-micro/go-micro.git synced 2025-08-10 21:52:01 +02:00

Change initialisation and add metadata

This commit is contained in:
Asim
2015-05-26 22:39:48 +01:00
parent 7aa2c82ced
commit 36b5ca46fe
16 changed files with 182 additions and 93 deletions

View File

@@ -16,7 +16,7 @@ type consulRegistry struct {
services map[string]*Service
}
func encodeMetaData(md map[string]string) []string {
func encodeMetadata(md map[string]string) []string {
var tags []string
for k, v := range md {
if b, err := json.Marshal(map[string]string{
@@ -28,7 +28,7 @@ func encodeMetaData(md map[string]string) []string {
return tags
}
func decodeMetaData(tags []string) map[string]string {
func decodeMetadata(tags []string) map[string]string {
md := make(map[string]string)
for _, tag := range tags {
var kv map[string]string
@@ -81,7 +81,7 @@ func (c *consulRegistry) Register(s *Service) error {
node := s.Nodes[0]
tags := encodeMetaData(node.MetaData)
tags := encodeMetadata(node.Metadata)
_, err := c.Client.Catalog().Register(&consul.CatalogRegistration{
Node: node.Id,
@@ -123,7 +123,7 @@ func (c *consulRegistry) GetService(name string) (*Service, error) {
Id: s.ServiceID,
Address: s.Address,
Port: s.ServicePort,
MetaData: decodeMetaData(s.ServiceTags),
Metadata: decodeMetadata(s.ServiceTags),
})
}

View File

@@ -45,7 +45,7 @@ func (cw *consulWatcher) serviceHandler(idx uint64, data interface{}) {
Id: e.Service.ID,
Address: e.Node.Address,
Port: e.Service.Port,
MetaData: decodeMetaData(e.Service.Tags),
Metadata: decodeMetadata(e.Service.Tags),
})
}

View File

@@ -9,7 +9,7 @@ type Registry interface {
type Service struct {
Name string
MetaData map[string]string
Metadata map[string]string
Nodes []*Node
}
@@ -17,7 +17,7 @@ type Node struct {
Id string
Address string
Port int
MetaData map[string]string
Metadata map[string]string
}
type options struct{}