From 6a5293d22d629e2467cae8e96dd343779c018612 Mon Sep 17 00:00:00 2001 From: Taras Madan Date: Wed, 14 Aug 2024 14:42:04 +0200 Subject: tools/syz-covermerger: use pkg/log --- pkg/covermerger/covermerger.go | 4 ++-- pkg/covermerger/provider_monorepo.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'pkg') diff --git a/pkg/covermerger/covermerger.go b/pkg/covermerger/covermerger.go index f9faa9387..506d870b0 100644 --- a/pkg/covermerger/covermerger.go +++ b/pkg/covermerger/covermerger.go @@ -8,10 +8,10 @@ import ( "encoding/csv" "fmt" "io" - "log" "strconv" "sync" + "github.com/google/syzkaller/pkg/log" "golang.org/x/exp/maps" "golang.org/x/sync/errgroup" ) @@ -76,7 +76,7 @@ type FileCoverageMerger interface { } func batchFileData(c *Config, targetFilePath string, records []FileRecord) (*MergeResult, error) { - log.Printf("processing %d records for %s", len(records), targetFilePath) + log.Logf(1, "processing %d records for %s", len(records), targetFilePath) repoBranchCommitsMap := make(map[RepoBranchCommit]bool) for _, record := range records { repoBranchCommitsMap[record.RepoBranchCommit()] = true diff --git a/pkg/covermerger/provider_monorepo.go b/pkg/covermerger/provider_monorepo.go index 21d6792e2..969422d9b 100644 --- a/pkg/covermerger/provider_monorepo.go +++ b/pkg/covermerger/provider_monorepo.go @@ -5,9 +5,9 @@ package covermerger import ( "fmt" - "log" "sync" + "github.com/google/syzkaller/pkg/log" "github.com/google/syzkaller/pkg/vcs" "github.com/google/syzkaller/sys/targets" ) @@ -66,7 +66,7 @@ func (mr *monoRepo) repoBranchPresent(rbc RepoBranchCommit) bool { func (mr *monoRepo) addRepoBranch(rbc RepoBranchCommit) error { rbc.Commit = "" mr.branches[rbc] = struct{}{} - log.Printf("cloning repo: %s, branch: %s", rbc.Repo, rbc.Branch) + log.Logf(0, "cloning repo: %s, branch: %s", rbc.Repo, rbc.Branch) if rbc.Repo == "" || rbc.Branch == "" { panic("repo and branch are needed") } -- cgit mrf-deployment