From 301a28a093372f1182253d021659425070ae8747 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 28 Feb 2023 11:23:27 -0700 Subject: Shorten the log lines if < LogLevelDebug --- lib/textui/log.go | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) (limited to 'lib/textui/log.go') diff --git a/lib/textui/log.go b/lib/textui/log.go index b4dcea4..2a6fdd4 100644 --- a/lib/textui/log.go +++ b/lib/textui/log.go @@ -237,28 +237,30 @@ func (l *logger) log(lvl dlog.LogLevel, writeMsg func(io.Writer)) { } // caller ////////////////////////////////////////////////////////////// - const ( - thisModule = "git.lukeshu.com/btrfs-progs-ng" - thisPackage = "git.lukeshu.com/btrfs-progs-ng/lib/textui" - maximumCallerDepth int = 25 - minimumCallerDepth int = 3 // runtime.Callers + .log + .Log - ) - var pcs [maximumCallerDepth]uintptr - depth := runtime.Callers(minimumCallerDepth, pcs[:]) - frames := runtime.CallersFrames(pcs[:depth]) - for f, again := frames.Next(); again; f, again = frames.Next() { - if !strings.HasPrefix(f.Function, thisModule+"/") { - continue - } - if strings.HasPrefix(f.Function, thisPackage+".") { - continue - } - if nextField == len(fieldKeys) { - logBuf.WriteString(" :") + if lvl >= dlog.LogLevelDebug { + const ( + thisModule = "git.lukeshu.com/btrfs-progs-ng" + thisPackage = "git.lukeshu.com/btrfs-progs-ng/lib/textui" + maximumCallerDepth int = 25 + minimumCallerDepth int = 3 // runtime.Callers + .log + .Log + ) + var pcs [maximumCallerDepth]uintptr + depth := runtime.Callers(minimumCallerDepth, pcs[:]) + frames := runtime.CallersFrames(pcs[:depth]) + for f, again := frames.Next(); again; f, again = frames.Next() { + if !strings.HasPrefix(f.Function, thisModule+"/") { + continue + } + if strings.HasPrefix(f.Function, thisPackage+".") { + continue + } + if nextField == len(fieldKeys) { + logBuf.WriteString(" :") + } + file := f.File[strings.LastIndex(f.File, thisModDir+"/")+len(thisModDir+"/"):] + fmt.Fprintf(logBuf, " (from %s:%d)", file, f.Line) + break } - file := f.File[strings.LastIndex(f.File, thisModDir+"/")+len(thisModDir+"/"):] - fmt.Fprintf(logBuf, " (from %s:%d)", file, f.Line) - break } // boilerplate ///////////////////////////////////////////////////////// -- cgit v1.2.3-2-g168b