Skip to content

Commit 0f20b88

Browse files
committed
More logs cleanup
Use more `debugf` in places that look definitely like developer's debug which is most probably useless to an end user. Promote some debug errors that looks more like warnings to use Warnf rather than Debugf. Signed-off-by: Kir Kolyshkin <[email protected]>
1 parent c5aec55 commit 0f20b88

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

resolver.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ func (r *resolver) handleIPQuery(name string, query *dns.Msg, ipType int) (*dns.
247247

248248
if addr == nil && ipv6Miss {
249249
// Send a reply without any Answer sections
250-
logrus.Debugf("[resolver] lookup name %s present without IPv6 address", name)
250+
logrus.Warnf("[resolver] lookup name %s present without IPv6 address", name)
251251
resp := createRespMsg(query)
252252
return resp, nil
253253
}
@@ -477,7 +477,7 @@ func (r *resolver) ServeDNS(w dns.ResponseWriter, query *dns.Msg) {
477477
err = co.WriteMsg(query)
478478
if err != nil {
479479
r.forwardQueryEnd()
480-
logrus.Debugf("[resolver] send to DNS server failed, %s", err)
480+
logrus.Warnf("[resolver] send to DNS server failed, %s", err)
481481
continue
482482
}
483483

@@ -486,24 +486,24 @@ func (r *resolver) ServeDNS(w dns.ResponseWriter, query *dns.Msg) {
486486
// client can retry over TCP
487487
if err != nil && err != dns.ErrTruncated {
488488
r.forwardQueryEnd()
489-
logrus.Debugf("[resolver] read from DNS server failed, %s", err)
489+
logrus.Warnf("[resolver] read from DNS server failed, %s", err)
490490
continue
491491
}
492492
r.forwardQueryEnd()
493493

494494
if resp == nil {
495-
logrus.Debugf("[resolver] external DNS %s:%s returned empty response for %q", proto, extDNS.IPStr, name)
495+
logrus.Warnf("[resolver] external DNS %s:%s returned empty response for %q", proto, extDNS.IPStr, name)
496496
break
497497
}
498498
switch resp.Rcode {
499499
case dns.RcodeServerFailure, dns.RcodeRefused:
500500
// Server returned FAILURE: continue with the next external DNS server
501501
// Server returned REFUSED: this can be a transitional status, so continue with the next external DNS server
502-
logrus.Debugf("[resolver] external DNS %s:%s responded with %s for %q", proto, extDNS.IPStr, statusString(resp.Rcode), name)
502+
logrus.Warnf("[resolver] external DNS %s:%s responded with %s for %q", proto, extDNS.IPStr, statusString(resp.Rcode), name)
503503
continue
504504
case dns.RcodeNameError:
505505
// Server returned NXDOMAIN. Stop resolution if it's an authoritative answer (see RFC 8020: https://tools.ietf.org/html/rfc8020#section-2)
506-
logrus.Debugf("[resolver] external DNS %s:%s responded with %s for %q", proto, extDNS.IPStr, statusString(resp.Rcode), name)
506+
logrus.Warnf("[resolver] external DNS %s:%s responded with %s for %q", proto, extDNS.IPStr, statusString(resp.Rcode), name)
507507
if resp.Authoritative {
508508
break
509509
}
@@ -512,7 +512,7 @@ func (r *resolver) ServeDNS(w dns.ResponseWriter, query *dns.Msg) {
512512
// All is well
513513
default:
514514
// Server gave some error. Log the error, and continue with the next external DNS server
515-
logrus.Debugf("[resolver] external DNS %s:%s responded with %s (code %d) for %q", proto, extDNS.IPStr, statusString(resp.Rcode), resp.Rcode, name)
515+
logrus.Warnf("[resolver] external DNS %s:%s responded with %s (code %d) for %q", proto, extDNS.IPStr, statusString(resp.Rcode), resp.Rcode, name)
516516
continue
517517
}
518518
answers := 0

sandbox.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,7 @@ func (sb *sandbox) resolveName(req string, networkName string, epList []*endpoin
637637
func (sb *sandbox) SetKey(basePath string) error {
638638
start := time.Now()
639639
defer func() {
640-
logrus.Debugf("sandbox set key processing took %s for container %s", time.Since(start), sb.ContainerID())
640+
debugf("sandbox set key processing took %s for container %s", time.Since(start), sb.ContainerID())
641641
}()
642642

643643
if basePath == "" {
@@ -691,7 +691,7 @@ func (sb *sandbox) SetKey(basePath string) error {
691691
}
692692

693693
func (sb *sandbox) EnableService() (err error) {
694-
logrus.Debugf("EnableService %s START", sb.containerID)
694+
debugf("EnableService %s START", sb.containerID)
695695
defer func() {
696696
if err != nil {
697697
sb.DisableService()
@@ -705,12 +705,12 @@ func (sb *sandbox) EnableService() (err error) {
705705
ep.enableService()
706706
}
707707
}
708-
logrus.Debugf("EnableService %s DONE", sb.containerID)
708+
debugf("EnableService %s DONE", sb.containerID)
709709
return nil
710710
}
711711

712712
func (sb *sandbox) DisableService() (err error) {
713-
logrus.Debugf("DisableService %s START", sb.containerID)
713+
debugf("DisableService %s START", sb.containerID)
714714
failedEps := []string{}
715715
defer func() {
716716
if len(failedEps) > 0 {
@@ -726,7 +726,7 @@ func (sb *sandbox) DisableService() (err error) {
726726
ep.disableService()
727727
}
728728
}
729-
logrus.Debugf("DisableService %s DONE", sb.containerID)
729+
debugf("DisableService %s DONE", sb.containerID)
730730
return nil
731731
}
732732

@@ -735,7 +735,7 @@ func releaseOSSboxResources(osSbox osl.Sandbox, ep *endpoint) {
735735
// Only remove the interfaces owned by this endpoint from the sandbox.
736736
if ep.hasInterface(i.SrcName()) {
737737
if err := i.Remove(); err != nil {
738-
logrus.Debugf("Remove interface %s failed: %v", i.SrcName(), err)
738+
logrus.WithError(err).Warnf("Remove interface %s failed", i.SrcName())
739739
}
740740
}
741741
}
@@ -749,7 +749,7 @@ func releaseOSSboxResources(osSbox osl.Sandbox, ep *endpoint) {
749749
if len(vip) > 0 && lbModeIsDSR {
750750
ipNet := &net.IPNet{IP: vip, Mask: net.CIDRMask(32, 32)}
751751
if err := osSbox.RemoveAliasIP(osSbox.GetLoopbackIfaceName(), ipNet); err != nil {
752-
logrus.WithError(err).Debugf("failed to remove virtual ip %v to loopback", ipNet)
752+
logrus.WithError(err).Warnf("Failed to remove virtual ip %v to loopback", ipNet)
753753
}
754754
}
755755

@@ -760,7 +760,7 @@ func releaseOSSboxResources(osSbox osl.Sandbox, ep *endpoint) {
760760
// Remove non-interface routes.
761761
for _, r := range joinInfo.StaticRoutes {
762762
if err := osSbox.RemoveStaticRoute(r); err != nil {
763-
logrus.Debugf("Remove route failed: %v", err)
763+
logrus.WithError(err).Warnf("Remove route failed")
764764
}
765765
}
766766
}

0 commit comments

Comments
 (0)