From 6e4f025d9c3fc863206f920e95fda9ed62aeec28 Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Sun, 20 Mar 2016 08:19:15 +0000 Subject: [PATCH] refactor: reduce duplication in nameserver logging and remove a dot import in the process --- nameserver/nameserver.go | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/nameserver/nameserver.go b/nameserver/nameserver.go index dd497960..90be88c6 100644 --- a/nameserver/nameserver.go +++ b/nameserver/nameserver.go @@ -8,7 +8,7 @@ import ( "github.com/miekg/dns" "github.com/weaveworks/mesh" - . "github.com/weaveworks/weave/common" + "github.com/weaveworks/weave/common" "github.com/weaveworks/weave/net/address" ) @@ -230,12 +230,17 @@ func (n *Nameserver) OnGossipBroadcast(_ mesh.PeerName, msg []byte) (mesh.Gossip return entries, err } +// Logging + func (n *Nameserver) infof(fmt string, args ...interface{}) { - Log.Infof("[nameserver %s] "+fmt, append([]interface{}{n.ourName}, args...)...) + n.logf(common.Log.Infof, fmt, args...) } func (n *Nameserver) debugf(fmt string, args ...interface{}) { - Log.Debugf("[nameserver %s] "+fmt, append([]interface{}{n.ourName}, args...)...) + n.logf(common.Log.Debugf, fmt, args...) } func (n *Nameserver) errorf(fmt string, args ...interface{}) { - Log.Errorf("[nameserver %s] "+fmt, append([]interface{}{n.ourName}, args...)...) + n.logf(common.Log.Errorf, fmt, args...) +} +func (n *Nameserver) logf(f func(string, ...interface{}), fmt string, args ...interface{}) { + f("[nameserver %s] "+fmt, append([]interface{}{n.ourName}, args...)...) }