From cd1999555714fb886493d2d04b6c472be55cebef Mon Sep 17 00:00:00 2001 From: Robin Jarry Date: Tue, 19 Jul 2022 22:31:51 +0200 Subject: logging: use level-based logger functions Do not pass logger objects around anymore. Shuffle some messages to make them consistent with the new logging API. Avoid using %v when a more specific verb exists for the argument types. The loggers are completely disabled (i.e. Sprintf is not even called) by default. They are only enabled when redirecting stdout to a file. Signed-off-by: Robin Jarry Acked-by: Moritz Poldrack --- lib/threadbuilder.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'lib/threadbuilder.go') diff --git a/lib/threadbuilder.go b/lib/threadbuilder.go index 334a846..59abd2f 100644 --- a/lib/threadbuilder.go +++ b/lib/threadbuilder.go @@ -1,9 +1,9 @@ package lib import ( - "log" "time" + "git.sr.ht/~rjarry/aerc/logging" "git.sr.ht/~rjarry/aerc/models" "git.sr.ht/~rjarry/aerc/worker/types" "github.com/gatherstars-com/jwz" @@ -14,15 +14,13 @@ type ThreadBuilder struct { messageidToUid map[string]uint32 seen map[uint32]bool threadedUids []uint32 - logger *log.Logger } -func NewThreadBuilder(logger *log.Logger) *ThreadBuilder { +func NewThreadBuilder() *ThreadBuilder { tb := &ThreadBuilder{ threadBlocks: make(map[uint32]jwz.Threadable), messageidToUid: make(map[string]uint32), seen: make(map[uint32]bool), - logger: logger, } return tb } @@ -58,7 +56,7 @@ func (builder *ThreadBuilder) Threads(uids []uint32) []*types.Thread { builder.RebuildUids(threads) elapsed := time.Since(start) - builder.logger.Println("ThreadBuilder:", len(threads), "threads created in", elapsed) + logging.Infof("%d threads created in %s", len(threads), elapsed) return threads } @@ -74,7 +72,7 @@ func (builder *ThreadBuilder) generateStructure(uids []uint32) jwz.Threadable { threader := jwz.NewThreader() threadStructure, err := threader.ThreadSlice(jwzThreads) if err != nil { - builder.logger.Printf("ThreadBuilder: threading operation return error: %#v", err) + logging.Errorf("failed slicing threads: %v", err) } return threadStructure } -- cgit v1.2.3