From 93ae9a1c2e1c78db81e5d4316381da54884b28fb Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Sun, 13 Jan 2019 10:22:01 +0100 Subject: [PATCH] lib/logger: Clean up LOGGER_DISCARD handing to unbreak tests When using newLogger() with an io.Writer, that writer should in fact be used... --- lib/logger/logger.go | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/lib/logger/logger.go b/lib/logger/logger.go index 26d6e1ea6..921eb0e65 100644 --- a/lib/logger/logger.go +++ b/lib/logger/logger.go @@ -70,21 +70,20 @@ type logger struct { var DefaultLogger = New() func New() Logger { + if os.Getenv("LOGGER_DISCARD") != "" { + // Hack to completely disable logging, for example when running + // benchmarks. + return newLogger(ioutil.Discard) + } return newLogger(controlStripper{os.Stdout}) } func newLogger(w io.Writer) Logger { - res := &logger{ + return &logger{ + logger: log.New(w, "", DefaultFlags), facilities: make(map[string]string), debug: make(map[string]struct{}), } - if os.Getenv("LOGGER_DISCARD") != "" { - // Hack to completely disable logging, for example when running benchmarks. - res.logger = log.New(ioutil.Discard, "", 0) - return res - } - res.logger = log.New(w, "", DefaultFlags) - return res } // AddHandler registers a new MessageHandler to receive messages with the