unistack-org/micro
4
0
Fork 2
Code Issues 18 Pull Requests Actions Packages Projects Releases 331 Wiki Activity

Merge pull request #807 from unistack-org/fixup

Browse Source 
some spelling fixes in memory and gossip registry
This commit is contained in:
Asim Aslam
2019-10-02 10:47:59 +01:00
committed by GitHub
parent 0cf7b70423 b722798caa
commit 9eb6262168
2 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
registry/gossip/gossip.go
View File

@@ -292,7 +292,7 @@ func (b *broadcast) Message() []byte {
return nil return nil
} }
if l := len(up); l > MaxPacketSize { if l := len(up); l > MaxPacketSize {
log.Logf("[gossip] broadcast message size %d bigger then MaxPacketSize %d", l, MaxPacketSize) log.Logf("[gossip] Registry broadcast message size %d bigger then MaxPacketSize %d", l, MaxPacketSize)
} }
return up return up
} }
@@ -427,14 +427,14 @@ func (g *gossipRegistry) connect(addrs []string) error {
return nil return nil
// in case of timeout fail with a timeout error // in case of timeout fail with a timeout error
case <-timeout: case <-timeout:
return fmt.Errorf("[gossip] connect timeout %v", g.addrs) return fmt.Errorf("[gossip] Registry connect timeout %v", g.addrs)
// got a tick, try to connect // got a tick, try to connect
case <-ticker.C: case <-ticker.C:
if _, err := fn(); err == nil { if _, err := fn(); err == nil {
log.Logf("[gossip] connect success for %v", g.addrs) log.Debugf("[gossip] Registry connect success for %v", g.addrs)
return nil return nil
} else { } else {
log.Logf("[gossip] connect failed for %v", g.addrs) log.Debugf("[gossip] Registry connect failed for %v", g.addrs)
} }
} }
} }
@@ -697,6 +697,8 @@ func (g *gossipRegistry) Options() registry.Options {
} }
func (g *gossipRegistry) Register(s *registry.Service, opts ...registry.RegisterOption) error { func (g *gossipRegistry) Register(s *registry.Service, opts ...registry.RegisterOption) error {
log.Debugf("[gossip] Registry registering service: %s", s.Name)
b, err := json.Marshal(s) b, err := json.Marshal(s)
if err != nil { if err != nil {
return err return err
@@ -716,7 +718,7 @@ func (g *gossipRegistry) Register(s *registry.Service, opts ...registry.Register
} }
if options.TTL == 0 && g.tcpInterval == 0 { if options.TTL == 0 && g.tcpInterval == 0 {
return fmt.Errorf("Require register TTL or interval for memberlist.Config") return fmt.Errorf("[gossip] Require register TTL or interval for memberlist.Config")
} }
up := &pb.Update{ up := &pb.Update{
@@ -747,6 +749,9 @@ func (g *gossipRegistry) Register(s *registry.Service, opts ...registry.Register
} }
func (g *gossipRegistry) Deregister(s *registry.Service) error { func (g *gossipRegistry) Deregister(s *registry.Service) error {
log.Debugf("[gossip] Registry deregistering service: %s", s.Name)
b, err := json.Marshal(s) b, err := json.Marshal(s)
if err != nil { if err != nil {
return err return err
@@ -834,7 +839,7 @@ func NewRegistry(opts ...registry.Option) registry.Registry {
// configure the gossiper // configure the gossiper
if err := configure(g, opts...); err != nil { if err := configure(g, opts...); err != nil {
log.Fatalf("[gossip] Error configuring registry: %v", err) log.Fatalf("[gossip] Registry configuring error: %v", err)
} }
// wait for setup // wait for setup
<-time.After(g.interval * 2) <-time.After(g.interval * 2)

18
registry/memory/memory.go
View File

@@ -78,7 +78,7 @@ func (m *Registry) ttlPrune() {
// split nodeTrackID into service Name, Version and Node Id // split nodeTrackID into service Name, Version and Node Id
trackIdSplit := strings.Split(nodeTrackId, "+") trackIdSplit := strings.Split(nodeTrackId, "+")
svcName, svcVersion, nodeId := trackIdSplit[0], trackIdSplit[1], trackIdSplit[2] svcName, svcVersion, nodeId := trackIdSplit[0], trackIdSplit[1], trackIdSplit[2]
log.Debugf("Registry TTL expired for service %s, node %s", svcName, nodeId) log.Debugf("[memory] Registry TTL expired for service %s, node %s", svcName, nodeId)
// we need to find a node that expired and delete it from service nodes // we need to find a node that expired and delete it from service nodes
if _, ok := m.Services[svcName]; ok { if _, ok := m.Services[svcName]; ok {
for _, service := range m.Services[svcName] { for _, service := range m.Services[svcName] {
@@ -178,7 +178,7 @@ func (m *Registry) Register(s *registry.Service, opts ...registry.RegisterOption
m.Lock() m.Lock()
defer m.Unlock() defer m.Unlock()
log.Debugf("Registry deregistering service: %s", s.Name) log.Debugf("[memory] Registry registering service: %s", s.Name)
var options registry.RegisterOptions var options registry.RegisterOptions
for _, o := range opts { for _, o := range opts {
@@ -189,7 +189,7 @@ func (m *Registry) Register(s *registry.Service, opts ...registry.RegisterOption
m.Services[s.Name] = []*registry.Service{s} m.Services[s.Name] = []*registry.Service{s}
// add all nodes into nodes map to track their TTL // add all nodes into nodes map to track their TTL
for _, n := range s.Nodes { for _, n := range s.Nodes {
log.Debugf("Registry tracking new service: %s, node %s", s.Name, n.Id) log.Debugf("[memory] Registry tracking new service: %s, node %s", s.Name, n.Id)
m.nodes[nodeTrackId(s.Name, s.Version, n.Id)] = &node{ m.nodes[nodeTrackId(s.Name, s.Version, n.Id)] = &node{
lastSeen: time.Now(), lastSeen: time.Now(),
ttl: options.TTL, ttl: options.TTL,
@@ -228,7 +228,7 @@ func (m *Registry) Register(s *registry.Service, opts ...registry.RegisterOption
} }
} }
if !found { if !found {
log.Debugf("Registry tracking new node: %s for service %s", n.Id, s.Name) log.Debugf("[memory] Registry tracking new node: %s for service %s", n.Id, s.Name)
m.nodes[nodeTrackId(s.Name, s.Version, n.Id)] = &node{ m.nodes[nodeTrackId(s.Name, s.Version, n.Id)] = &node{
lastSeen: time.Now(), lastSeen: time.Now(),
ttl: options.TTL, ttl: options.TTL,
@@ -242,7 +242,7 @@ func (m *Registry) Register(s *registry.Service, opts ...registry.RegisterOption
// refresh the timestamp and TTL of the service node // refresh the timestamp and TTL of the service node
for _, n := range s.Nodes { for _, n := range s.Nodes {
trackId := nodeTrackId(s.Name, s.Version, n.Id) trackId := nodeTrackId(s.Name, s.Version, n.Id)
log.Debugf("Registry refreshing TTL for node %s for service %s", n.Id, s.Name) log.Debugf("[memory] Registry refreshing TTL for node %s for service %s", n.Id, s.Name)
if trackedNode, ok := m.nodes[trackId]; ok { if trackedNode, ok := m.nodes[trackId]; ok {
trackedNode.lastSeen = time.Now() trackedNode.lastSeen = time.Now()
trackedNode.ttl = options.TTL trackedNode.ttl = options.TTL
@@ -258,7 +258,7 @@ func (m *Registry) Deregister(s *registry.Service) error {
m.Lock() m.Lock()
defer m.Unlock() defer m.Unlock()
log.Debugf("Registry deregistering service: %s", s.Name) log.Debugf("[memory] Registry deregistering service: %s", s.Name)
if service, ok := m.Services[s.Name]; ok { if service, ok := m.Services[s.Name]; ok {
// svcNodes collects the list of all node Ids for each service version // svcNodes collects the list of all node Ids for each service version
@@ -277,11 +277,11 @@ func (m *Registry) Deregister(s *registry.Service) error {
// if there are no more services we know we have either removed all nodes or there were no nodes // if there are no more services we know we have either removed all nodes or there were no nodes
if updatedService := registry.Remove(service, []*registry.Service{s}); len(updatedService) == 0 { if updatedService := registry.Remove(service, []*registry.Service{s}); len(updatedService) == 0 {
for _, id := range svcNodes[s.Name][s.Version] { for _, id := range svcNodes[s.Name][s.Version] {
log.Debugf("Registry stopped tracking node %s for service %s", id, s.Name) log.Debugf("[memory] Registry stopped tracking node %s for service %s", id, s.Name)
delete(m.nodes, nodeTrackId(s.Name, s.Version, id)) delete(m.nodes, nodeTrackId(s.Name, s.Version, id))
go m.sendEvent(&registry.Result{Action: "delete", Service: s}) go m.sendEvent(&registry.Result{Action: "delete", Service: s})
} }
log.Debugf("Registry deleting service %s: no service nodes", s.Name) log.Debugf("[memory] Registry deleting service %s: no service nodes", s.Name)
delete(m.Services, s.Name) delete(m.Services, s.Name)
return nil return nil
} else { } else {
@@ -296,7 +296,7 @@ func (m *Registry) Deregister(s *registry.Service) error {
} }
} }
if !found { if !found {
log.Debugf("Registry stopped tracking node %s for service %s", id, s.Name) log.Debugf("[memory] Registry stopped tracking node %s for service %s", id, s.Name)
delete(m.nodes, nodeTrackId(s.Name, s.Version, id)) delete(m.nodes, nodeTrackId(s.Name, s.Version, id))
go m.sendEvent(&registry.Result{Action: "delete", Service: s}) go m.sendEvent(&registry.Result{Action: "delete", Service: s})
} }