From c7a5e2a09a3a40010fbf66b9cceeda1a5ca9f3cf Mon Sep 17 00:00:00 2001
From: Aleksandr Nogikh <nogikh@google.com>
Date: Mon, 8 May 2023 17:39:52 +0200
Subject: syz-ci: improve logging

1) Set the name of the instace to improve log analysis.
2) Use log.Errorf for errors that deserve human attention.
---
 syz-ci/jobs.go    | 2 +-
 syz-ci/manager.go | 2 +-
 syz-ci/syz-ci.go  | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'syz-ci')

diff --git a/syz-ci/jobs.go b/syz-ci/jobs.go
index 7de7cdfe6..38a2546c6 100644
--- a/syz-ci/jobs.go
+++ b/syz-ci/jobs.go
@@ -767,7 +767,7 @@ func (jp *JobProcessor) Logf(level int, msg string, args ...interface{}) {
 
 // Errorf logs non-fatal error and sends it to dashboard.
 func (jp *JobProcessor) Errorf(msg string, args ...interface{}) {
-	log.Logf(0, "job: "+msg, args...)
+	log.Errorf("job: "+msg, args...)
 	if jp.dash != nil {
 		jp.dash.LogError(jp.name, msg, args...)
 	}
diff --git a/syz-ci/manager.go b/syz-ci/manager.go
index e4c368269..134547b67 100644
--- a/syz-ci/manager.go
+++ b/syz-ci/manager.go
@@ -870,7 +870,7 @@ func uploadFileHTTPPut(URL string, file io.Reader) error {
 
 // Errorf logs non-fatal error and sends it to dashboard.
 func (mgr *Manager) Errorf(msg string, args ...interface{}) {
-	log.Logf(0, mgr.name+": "+msg, args...)
+	log.Errorf(mgr.name+": "+msg, args...)
 	if mgr.dash != nil {
 		mgr.dash.LogError(mgr.name, msg, args...)
 	}
diff --git a/syz-ci/syz-ci.go b/syz-ci/syz-ci.go
index 0e5fe6b6e..68a804f84 100644
--- a/syz-ci/syz-ci.go
+++ b/syz-ci/syz-ci.go
@@ -207,6 +207,7 @@ func main() {
 	if err != nil {
 		log.Fatalf("failed to load config: %v", err)
 	}
+	log.SetName(cfg.Name)
 
 	shutdownPending := make(chan struct{})
 	osutil.HandleInterrupts(shutdownPending)
@@ -235,7 +236,7 @@ func main() {
 	for _, mgrcfg := range cfg.Managers {
 		mgr, err := createManager(cfg, mgrcfg, stop, *flagDebug)
 		if err != nil {
-			log.Logf(0, "failed to create manager %v: %v", mgrcfg.Name, err)
+			log.Errorf("failed to create manager %v: %v", mgrcfg.Name, err)
 			continue
 		}
 		managers = append(managers, mgr)
@@ -302,8 +303,7 @@ func deprecateAssets(cfg *Config, stop chan struct{}, wg *sync.WaitGroup) {
 	}
 	storage, err := asset.StorageFromConfig(cfg.AssetStorage, dash)
 	if err != nil {
-		dash.LogError("syz-ci",
-			"failed to create asset storage during asset deprecation: %v", err)
+		log.Errorf("failed to create asset storage during asset deprecation: %v", err)
 		return
 	}
 loop:
@@ -317,7 +317,7 @@ loop:
 		log.Logf(0, "deprecating assets")
 		err := storage.DeprecateAssets()
 		if err != nil {
-			dash.LogError("syz-ci", "asset deprecation failed: %v", err)
+			log.Errorf("asset deprecation failed: %v", err)
 		}
 	}
 }
-- 
cgit mrf-deployment