From d2cea4b7b7a0cfb90d96858168c58fea3c0ca329 Mon Sep 17 00:00:00 2001 From: ben-toogood Date: Fri, 31 Jul 2020 14:40:11 +0100 Subject: [PATCH] registry/etcd: fix logging nil pointer dereference (#1888) --- registry/etcd/etcd.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/registry/etcd/etcd.go b/registry/etcd/etcd.go index c9e8f08d..c6cb263a 100644 --- a/registry/etcd/etcd.go +++ b/registry/etcd/etcd.go @@ -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 var putOpts []clientv3.OpOption if lgr != nil { 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)