From b722798caafa7468ac55d919d0801a6195835d6f Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Wed, 2 Oct 2019 03:48:51 +0300 Subject: [PATCH] some spelling fixes in memory and gossip registry Signed-off-by: Vasiliy Tolstov --- registry/gossip/gossip.go | 17 +++++++++++------ registry/memory/memory.go | 18 +++++++++--------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/registry/gossip/gossip.go b/registry/gossip/gossip.go index 24006438..416422f1 100644 --- a/registry/gossip/gossip.go +++ b/registry/gossip/gossip.go @@ -292,7 +292,7 @@ func (b *broadcast) Message() []byte { return nil } 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 } @@ -427,14 +427,14 @@ func (g *gossipRegistry) connect(addrs []string) error { return nil // in case of timeout fail with a timeout error 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 case <-ticker.C: 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 } 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 { + log.Debugf("[gossip] Registry registering service: %s", s.Name) + b, err := json.Marshal(s) if err != nil { return err @@ -716,7 +718,7 @@ func (g *gossipRegistry) Register(s *registry.Service, opts ...registry.Register } 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{ @@ -747,6 +749,9 @@ func (g *gossipRegistry) Register(s *registry.Service, opts ...registry.Register } func (g *gossipRegistry) Deregister(s *registry.Service) error { + + log.Debugf("[gossip] Registry deregistering service: %s", s.Name) + b, err := json.Marshal(s) if err != nil { return err @@ -834,7 +839,7 @@ func NewRegistry(opts ...registry.Option) registry.Registry { // configure the gossiper 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 <-time.After(g.interval * 2) diff --git a/registry/memory/memory.go b/registry/memory/memory.go index 810d8d4c..eecb1284 100644 --- a/registry/memory/memory.go +++ b/registry/memory/memory.go @@ -78,7 +78,7 @@ func (m *Registry) ttlPrune() { // split nodeTrackID into service Name, Version and Node Id trackIdSplit := strings.Split(nodeTrackId, "+") 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 if _, ok := m.Services[svcName]; ok { for _, service := range m.Services[svcName] { @@ -178,7 +178,7 @@ func (m *Registry) Register(s *registry.Service, opts ...registry.RegisterOption m.Lock() defer m.Unlock() - log.Debugf("Registry deregistering service: %s", s.Name) + log.Debugf("[memory] Registry registering service: %s", s.Name) var options registry.RegisterOptions 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} // add all nodes into nodes map to track their TTL 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{ lastSeen: time.Now(), ttl: options.TTL, @@ -228,7 +228,7 @@ func (m *Registry) Register(s *registry.Service, opts ...registry.RegisterOption } } 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{ lastSeen: time.Now(), 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 for _, n := range s.Nodes { 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 { trackedNode.lastSeen = time.Now() trackedNode.ttl = options.TTL @@ -258,7 +258,7 @@ func (m *Registry) Deregister(s *registry.Service) error { m.Lock() 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 { // 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 updatedService := registry.Remove(service, []*registry.Service{s}); len(updatedService) == 0 { 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)) go m.sendEvent(®istry.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) return nil } else { @@ -296,7 +296,7 @@ func (m *Registry) Deregister(s *registry.Service) error { } } 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)) go m.sendEvent(®istry.Result{Action: "delete", Service: s}) }