unistack-org/micro
3
0
Fork 2
Code Issues 21 Pull Requests 2 Actions Packages Projects Releases 295 Wiki Activity

registry/etcd: fix logging nil pointer dereference (#1888)

Browse Source
This commit is contained in:
ben-toogood 2020-07-31 14:40:11 +01:00 committed by GitHub
parent 0b73d411ad
commit d2cea4b7b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
registry/etcd/etcd.go
View File

@ -295,14 +295,16 @@ func (e *etcdRegistry) registerNode(s *registry.Service, node *registry.Node, op
} }
} }
if logger.V(logger.TraceLevel, logger.DefaultLogger) {
logger.Tracef("Registering %s id %s with lease %v and leaseID %v and ttl %v", service.Name, node.Id, lgr, lgr.ID, options.TTL)
}
// create an entry for the node // create an entry for the node
var putOpts []clientv3.OpOption var putOpts []clientv3.OpOption
if lgr != nil { if lgr != nil {
putOpts = append(putOpts, clientv3.WithLease(lgr.ID)) putOpts = append(putOpts, clientv3.WithLease(lgr.ID))
if logger.V(logger.TraceLevel, logger.DefaultLogger) {
logger.Tracef("Registering %s id %s without lease", service.Name, node.Id)
}
} else if logger.V(logger.TraceLevel, logger.DefaultLogger) {
logger.Tracef("Registering %s id %s with lease %v and leaseID %v and ttl %v", service.Name, node.Id, lgr, lgr.ID, options.TTL)
} }
key := nodePath(options.Domain, s.Name, node.Id) key := nodePath(options.Domain, s.Name, node.Id)