From 70aa79562e966db0c6333e69bb91e759bb7bed27 Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Mon, 16 Jan 2023 11:01:40 +0100 Subject: [PATCH] textlogger: fix vmodule support When Logger.Info called Enabled, the wrong number of stack frames were skipped. A unit test for this will follow. --- textlogger/textlogger.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/textlogger/textlogger.go b/textlogger/textlogger.go index 17706d6da..3c6cda645 100644 --- a/textlogger/textlogger.go +++ b/textlogger/textlogger.go @@ -88,7 +88,9 @@ func (l *tlogger) WithCallDepth(depth int) logr.LogSink { } func (l *tlogger) Enabled(level int) bool { - return l.config.Enabled(verbosity.Level(level), 1) + // Skip this function and the Logger.Info call, then + // also any additional stack frames from WithCallDepth. + return l.config.Enabled(verbosity.Level(level), 2+l.callDepth) } func (l *tlogger) Info(level int, msg string, kvList ...interface{}) {