From 911138a4368d8997d3a9da9267f6372a310b3ea6 Mon Sep 17 00:00:00 2001 From: fazledyn-or Date: Fri, 12 Jan 2024 12:14:38 +0600 Subject: [PATCH] Fixed Improper Logging Methods Signed-off-by: fazledyn-or --- server/manager/biz/midware/rbacAuth.go | 2 +- server/manager/internal/aconfig/config.go | 2 +- server/manager/internal/dbtask/rasp_heartbeat.go | 4 ++-- server/manager/internal/distribute/job/job.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/server/manager/biz/midware/rbacAuth.go b/server/manager/biz/midware/rbacAuth.go index ffda50dad..939b885e7 100644 --- a/server/manager/biz/midware/rbacAuth.go +++ b/server/manager/biz/midware/rbacAuth.go @@ -155,7 +155,7 @@ func RuleIDSort(one MetaRule, other MetaRule) bool { func RBACAuth() gin.HandlerFunc { return func(c *gin.Context) { if ACWorker == nil { - ylog.Debugf("RBACAuth", "ACWorker Is nil %s, all request will be passed") + ylog.Debugf("RBACAuth", "ACWorker Is nil, all request will be passed") c.Next() return } diff --git a/server/manager/internal/aconfig/config.go b/server/manager/internal/aconfig/config.go index 5710bc179..21c14a952 100644 --- a/server/manager/internal/aconfig/config.go +++ b/server/manager/internal/aconfig/config.go @@ -37,7 +37,7 @@ func GetDefaultConfig() []AgentConfigMsg { filter := bson.M{"type": DefaultAgentConfig, "version": DefaultConfigVersion} err := collection.FindOne(context.Background(), filter).Decode(&config) if err != nil { - ylog.Infof("GetDefaultConfig", "default config is not set, now use empty config, error is :", err.Error()) + ylog.Infof("GetDefaultConfig", "default config is not set, now use empty config, error is : %s", err.Error()) return []AgentConfigMsg{} } return config.Config diff --git a/server/manager/internal/dbtask/rasp_heartbeat.go b/server/manager/internal/dbtask/rasp_heartbeat.go index 62a80af81..9e71a4bb5 100644 --- a/server/manager/internal/dbtask/rasp_heartbeat.go +++ b/server/manager/internal/dbtask/rasp_heartbeat.go @@ -355,7 +355,7 @@ func (w *leaderRaspWriter) Run() { res, err := raspHbCol.BulkWrite(context.Background(), raspHbWrites, writeOption) if err != nil { - ylog.Errorf("leaderRaspWriter_BulkWrite", "error:%s len:%s", err.Error(), len(raspHbWrites)) + ylog.Errorf("leaderRaspWriter_BulkWrite", "error:%s len:%d", err.Error(), len(raspHbWrites)) } else { ylog.Debugf("leaderRaspWriter_BulkWrite", "UpsertedCount:%d InsertedCount:%d ModifiedCount:%d ", res.UpsertedCount, res.InsertedCount, res.ModifiedCount) } @@ -367,7 +367,7 @@ func (w *leaderRaspWriter) Run() { if count >= 100 { res, err := raspHbCol.BulkWrite(context.Background(), raspHbWrites, writeOption) if err != nil { - ylog.Errorf("leaderRaspWriter_BulkWrite", "error:%s len:%s", err.Error(), len(raspHbWrites)) + ylog.Errorf("leaderRaspWriter_BulkWrite", "error:%s len:%d", err.Error(), len(raspHbWrites)) } else { ylog.Debugf("leaderRaspWriter_BulkWrite", "UpsertedCount:%d InsertedCount:%d ModifiedCount:%d ", res.UpsertedCount, res.InsertedCount, res.ModifiedCount) } diff --git a/server/manager/internal/distribute/job/job.go b/server/manager/internal/distribute/job/job.go index d9112aee8..a101328d3 100644 --- a/server/manager/internal/distribute/job/job.go +++ b/server/manager/internal/distribute/job/job.go @@ -329,7 +329,7 @@ func (sj *SimpleJob) push2Redis(ctx context.Context, key string, list []interfac if i+gradient < len(list) { err := sj.Rds.LPush(context.Background(), key, list[i:i+gradient]...).Err() if err != nil { - ylog.Errorf("SimpleJob", "[job] %s error %s, len of key list %d", sj.Id, err.Error(), key, len(list[i:i+gradient])) + ylog.Errorf("SimpleJob", "[job] %s error %s, key %s len of list %d", sj.Id, err.Error(), key, len(list[i:i+gradient])) } } else { if len(list[i:]) == 0 {