unistack-org/micro
4
0
Fork 3
Code Issues 20 Pull Requests 1 Actions Packages Projects Releases 282 Wiki Activity

Turn regular logs to Debug logs; annotate with Registry "tag"

Browse Source
This commit is contained in:
Milos Gajdos 2019-09-30 11:11:32 +01:00
parent 859ecb1872
commit 3f3f1272b3
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
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.Logf("TTL threshold reached for node %s for service %s", nodeId, svcName) log.Debugf("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] {
@ -187,7 +187,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.Logf("Tracking node %s for service %s", n.Id, s.Name) log.Debugf("Registry tracking 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,
@ -216,7 +216,7 @@ func (m *Registry) Register(s *registry.Service, opts ...registry.RegisterOption
m.Services[s.Name] = merged m.Services[s.Name] = merged
// we know s is the new [version of] service; we need to strart tracking its nodes // we know s is the new [version of] service; we need to strart tracking its nodes
for _, n := range s.Nodes { for _, n := range s.Nodes {
log.Logf("Tracking node %s for service %s", n.Id, s.Name) log.Debugf("Registry tracking 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,
@ -238,7 +238,7 @@ func (m *Registry) Register(s *registry.Service, opts ...registry.RegisterOption
} }
} }
if !found { if !found {
log.Logf("Tracking node %s for service %s", n.Id, s.Name) log.Debugf("Registry tracking 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,
@ -252,7 +252,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.Logf("Refreshing TTL for node %s for service %s", n.Id, s.Name) log.Debugf("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
@ -284,7 +284,7 @@ func (m *Registry) Deregister(s *registry.Service) error {
} }
if service := registry.Remove(service, []*registry.Service{s}); len(service) == 0 { if service := registry.Remove(service, []*registry.Service{s}); len(service) == 0 {
id := svcNodes[s.Name][s.Version][0] id := svcNodes[s.Name][s.Version][0]
log.Logf("Stopped tracking node %s for service %s", id, s.Name) log.Debugf("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))
delete(m.Services, s.Name) delete(m.Services, s.Name)
} else { } else {
@ -299,7 +299,7 @@ func (m *Registry) Deregister(s *registry.Service) error {
} }
} }
if !found { if !found {
log.Logf("Stopped tracking node %s for service %s", id, s.Name) log.Debugf("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))
} }
} }