diff --git a/dbm-services/common/go-pubpkg/logger/cst.go b/dbm-services/common/go-pubpkg/logger/cst.go index 265c9512a0..9b4b4ad9f7 100644 --- a/dbm-services/common/go-pubpkg/logger/cst.go +++ b/dbm-services/common/go-pubpkg/logger/cst.go @@ -27,3 +27,6 @@ const ( // DatetimeUnion TODO const DatetimeUnion = "20160102150405" + +// NotForAi 不做AI分析的日志标签 +const NotForAi = "not_for_ai" diff --git a/dbm-services/common/go-pubpkg/logger/field.go b/dbm-services/common/go-pubpkg/logger/field.go index f56e09217d..a8110bc073 100644 --- a/dbm-services/common/go-pubpkg/logger/field.go +++ b/dbm-services/common/go-pubpkg/logger/field.go @@ -119,6 +119,11 @@ var ( // Local TODO Local = std.Local + + // InfoNotForAi 不做AI分析的日志输出函数 + InfoNotForAi = std.InfoNotForAi + // InfoWithLabel 带标签的Info日志输出函数 + InfoWithLabel = std.InfoWithLabel ) var std = New(os.Stderr, false, InfoLevel) @@ -139,6 +144,8 @@ func ResetDefault(l *Logger) { Fatal = std.Fatal Debug = std.Debug Local = std.Local + InfoNotForAi = std.InfoNotForAi + InfoWithLabel = std.InfoWithLabel } // Sync TODO diff --git a/dbm-services/common/go-pubpkg/logger/logger.go b/dbm-services/common/go-pubpkg/logger/logger.go index 0077227999..0e319a8154 100644 --- a/dbm-services/common/go-pubpkg/logger/logger.go +++ b/dbm-services/common/go-pubpkg/logger/logger.go @@ -40,6 +40,17 @@ func (l *Logger) Info(format string, args ...interface{}) { l.Zap.Info(fmt.Sprintf(format, args...), l.Fields...) } +// InfoWithLabel 输出带标签的日志 +func (l *Logger) InfoWithLabel(label string, format string, args ...interface{}) { + fields := append(l.Fields, zap.String("label", label)) + l.Zap.Info(fmt.Sprintf(format, args...), fields...) +} + +// InfoNotForAi 输出不用于AI分析的日志,避免超过ai模型输入限制 +func (l *Logger) InfoNotForAi(format string, args ...interface{}) { + l.InfoWithLabel(NotForAi, format, args...) +} + // Warn TODO func (l *Logger) Warn(format string, args ...interface{}) { l.Zap.Warn(fmt.Sprintf(format, args...), l.Fields...) diff --git a/dbm-services/common/go-pubpkg/logger/logger_test.go b/dbm-services/common/go-pubpkg/logger/logger_test.go index 75eda93620..9242ffd71c 100644 --- a/dbm-services/common/go-pubpkg/logger/logger_test.go +++ b/dbm-services/common/go-pubpkg/logger/logger_test.go @@ -27,3 +27,16 @@ func TestDefault(t *testing.T) { Info("testing default info") } + +func TestNotForAi(t *testing.T) { + file, err := os.OpenFile("./access.log", os.O_CREATE|os.O_APPEND|os.O_WRONLY, os.ModePerm) + if err != nil { + panic(err) + } + logger := New(file, false, InfoLevel) + ResetDefault(logger) + defer Sync() + Info("testing default info") + InfoNotForAi("testing info not for ai") + Info("testing default info") +} diff --git a/dbm-services/mysql/db-tools/dbactuator/pkg/components/mysql/execute_partition_sql.go b/dbm-services/mysql/db-tools/dbactuator/pkg/components/mysql/execute_partition_sql.go index 7efb527350..426a8d60a5 100644 --- a/dbm-services/mysql/db-tools/dbactuator/pkg/components/mysql/execute_partition_sql.go +++ b/dbm-services/mysql/db-tools/dbactuator/pkg/components/mysql/execute_partition_sql.go @@ -269,7 +269,8 @@ func (e *ExecutePartitionSQLComp) excuteOne( for _, partitionSQL := range partitionSQLSet { _, err = dbw.Exec(partitionSQL) if err != nil { - errs = append(errs, fmt.Sprintf("%s执行失败,报错:%s", partitionSQL, err.Error())) + logger.InfoNotForAi("%s执行失败,报错:%s", partitionSQL, err.Error()) + errs = append(errs, fmt.Sprintf("执行失败报错:%s\n", err.Error())) } // c <- struct{}{} // wg.Add(1) @@ -350,7 +351,8 @@ func (e *ExecutePartitionSQLComp) excuteInitSql( Password: e.GeneralParam.RuntimeAccountParam.PartitionYwPwd, }.ExecuteInitPartition(command) if err != nil { - errs = append(errs, fmt.Sprintf("%s执行失败,报错:%s", command, err.Error())) + logger.InfoNotForAi("%s执行失败,报错:%s\n", command, err.Error()) + errs = append(errs, fmt.Sprintf("执行失败报错:%s\n", err.Error())) } } } diff --git a/dbm-services/sqlserver/db-tools/dbactuator/pkg/util/sqlserver/sqlserver.go b/dbm-services/sqlserver/db-tools/dbactuator/pkg/util/sqlserver/sqlserver.go index 2c6c8a3a0c..2c635c10f2 100644 --- a/dbm-services/sqlserver/db-tools/dbactuator/pkg/util/sqlserver/sqlserver.go +++ b/dbm-services/sqlserver/db-tools/dbactuator/pkg/util/sqlserver/sqlserver.go @@ -631,7 +631,7 @@ func ExecLocalSQLFile(sqlVersion string, dbName string, charsetNO int, filenames logger.Error("the db [%s] exec sql script failed %s, result: %s ", dbName, err.Error(), ret) return err } - logger.Info("exec result: %s", ret) + logger.InfoNotForAi("exec result: %s", ret) logger.Info("ths db [%s] exec sql script success [%d:%s]", dbName, port, filename) } @@ -661,7 +661,7 @@ func ExecLocalSQLFileForDataExport(sqlVersion string, dbName string, filenames [ logger.Error("the db [%s] exec sql script failed %s, result: %s ", dbName, err.Error(), ret) return outPutFiles, err } - logger.Info("exec result: %s", ret) + logger.InfoNotForAi("exec result: %s", ret) logger.Info("ths db [%s] exec sql select script success [%d:%s]", dbName, port, filename) }