From b2439788d7293b95b30c6941cd5ca4e7631807f7 Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Mon, 11 Nov 2019 22:18:43 +0000 Subject: [PATCH] Reduce logging in dqlite --- pkg/dqlite/log.go | 8 +++++++- pkg/dqlite/pipe/pipe.go | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pkg/dqlite/log.go b/pkg/dqlite/log.go index e7185b7797..bbd07c8017 100644 --- a/pkg/dqlite/log.go +++ b/pkg/dqlite/log.go @@ -1,6 +1,8 @@ package dqlite import ( + "strings" + "github.com/canonical/go-dqlite/client" "github.com/sirupsen/logrus" ) @@ -13,7 +15,11 @@ func log() client.LogFunc { case client.LogError: logrus.Errorf(s, i...) case client.LogInfo: - logrus.Infof(s, i...) + if strings.HasPrefix(s, "connected") { + logrus.Debugf(s, i...) + } else { + logrus.Infof(s, i...) + } case client.LogWarn: logrus.Warnf(s, i...) } diff --git a/pkg/dqlite/pipe/pipe.go b/pkg/dqlite/pipe/pipe.go index cf8d6113c0..fc00031318 100644 --- a/pkg/dqlite/pipe/pipe.go +++ b/pkg/dqlite/pipe/pipe.go @@ -29,7 +29,7 @@ func Connect(src net.Conn, dst net.Conn) { go func() { _, err := io.Copy(eagain.Writer{Writer: dst}, eagain.Reader{Reader: src}) if err != nil && err != io.EOF { - logrus.Warnf("copy pipe src->dst closed: %v", err) + logrus.Debugf("copy pipe src->dst closed: %v", err) } src.Close() dst.Close() @@ -38,7 +38,7 @@ func Connect(src net.Conn, dst net.Conn) { go func() { _, err := io.Copy(eagain.Writer{Writer: src}, eagain.Reader{Reader: dst}) if err != nil { - logrus.Warnf("copy pipe dst->src closed: %v", err) + logrus.Debugf("copy pipe dst->src closed: %v", err) } src.Close() dst.Close()