feat/dns reload/#16418

dbm-services/common/db-dns/dns-reload/config/config.conf

@@ -1,6 +1,14 @@
+# 日志路径
 info_log_path="../log/info.log"
 error_log_path="../log/err.log"
 
+# lumberjack 配置（可选，不配置则使用默认值）
+log_max_size = 100        # 单个文件最大 100MB
+log_max_backups = 5       # 保留 5 个备份
+log_max_age = 7           # 保留 7 天
+log_compress = true       # 压缩旧文件
+log_to_console = false     # 同时输出到控制台
+
 db_cloud_token=""
 bk_dns_api_url=""
 bk_cloud_id="2"

dbm-services/common/db-dns/dns-reload/config/init.go

@@ -27,7 +27,7 @@ func InitConfig(configFile string) {
 			if err == io.EOF {
 				break
 			}
-			log.Fatalln("read config error ")
+			log.Printf("read config error ")
 			os.Exit(2)
 		}
 		s := strings.TrimSpace(strings.ReplaceAll(string(b), "\"", ""))
@@ -51,8 +51,8 @@ func InitConfig(configFile string) {
 func GetConfig(k string) string {
 	v, _ok := ConfigMap[k]
 	if !_ok {
-		log.Fatalln(" unknown  parameter %s in config ", k)
-		os.Exit(2)
+		log.Printf(" unknown  parameter %s in config.", k)
+		return ""
 	}
 
 	return v

dbm-services/common/db-dns/dns-reload/go.mod

@@ -1,3 +1,5 @@
 module dnsReload
 
 go 1.19
+
+require gopkg.in/natefinch/lumberjack.v2 v2.2.1

dbm-services/common/db-dns/dns-reload/go.sum

@@ -0,0 +1,2 @@
+gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc=
+gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc=

dbm-services/common/db-dns/dns-reload/logger/init.go

@@ -6,37 +6,107 @@ import (
 	"io/ioutil"
 	"log"
 	"os"
+	"path/filepath"
+	"strconv"
+
+	"gopkg.in/natefinch/lumberjack.v2"
 )
 
-// 初始化日志
 var (
 	Trace   *log.Logger
 	Info    *log.Logger
 	Warning *log.Logger
 	Error   *log.Logger
 )
 
-// InitLogger TODO
+// getConfigSafe 安全获取配置，不存在返回默认值
+func getConfigSafe(key, defaultVal string) string {
+	val := config.GetConfig(key)
+	if val == "" || val == key { // 有些配置系统找不到会返回key本身
+		return defaultVal
+	}
+	return val
+}
+
+// parseIntSafe 安全解析整数
+func parseIntSafe(s string, defaultVal int) int {
+	if i, err := strconv.Atoi(s); err == nil {
+		return i
+	}
+	return defaultVal
+}
+
+// parseBoolSafe 安全解析布尔值
+func parseBoolSafe(s string, defaultVal bool) bool {
+	if b, err := strconv.ParseBool(s); err == nil {
+		return b
+	}
+	return defaultVal
+}
+
+// InitLogger 初始化带轮转的日志
 func InitLogger() {
-	errFile, err := os.OpenFile(config.GetConfig("error_log_path"),
-		os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0666)
-	if err != nil {
-		log.Fatalln("Failed to open error log file:", err)
+	errorLogPath := config.GetConfig("error_log_path")
+	infoLogPath := config.GetConfig("info_log_path")
+
+	// 确保日志目录存在
+	for _, path := range []string{errorLogPath, infoLogPath} {
+		if dir := filepath.Dir(path); dir != "." {
+			if err := os.MkdirAll(dir, 0755); err != nil {
+				log.Fatalf("创建日志目录 %s 失败: %v", dir, err)
+			}
+		}
+	}
+
+	// 读取配置（不存在则使用默认值，不会报错）
+	maxSize := parseIntSafe(getConfigSafe("log_max_size", "100"), 100)
+	maxBackups := parseIntSafe(getConfigSafe("log_max_backups", "10"), 10)
+	maxAge := parseIntSafe(getConfigSafe("log_max_age", "7"), 7)
+	compress := parseBoolSafe(getConfigSafe("log_compress", "true"), true)
+	toConsole := parseBoolSafe(getConfigSafe("log_to_console", "false"), false)
+
+	// 创建写入器
+	errorWriter := &lumberjack.Logger{
+		Filename:   errorLogPath,
+		MaxSize:    maxSize,
+		MaxBackups: maxBackups,
+		MaxAge:     maxAge,
+		Compress:   compress,
+		LocalTime:  true,
+	}
+
+	infoWriter := &lumberjack.Logger{
+		Filename:   infoLogPath,
+		MaxSize:    maxSize,
+		MaxBackups: maxBackups,
+		MaxAge:     maxAge,
+		Compress:   compress,
+		LocalTime:  true,
+	}
+
+	// 构建输出目标
+	var errorDest io.Writer = errorWriter
+	var infoDest io.Writer = infoWriter
+
+	if toConsole {
+		errorDest = io.MultiWriter(errorWriter, os.Stderr)
+		infoDest = io.MultiWriter(infoWriter, os.Stdout)
 	}
 
+	// 初始化日志
 	Trace = log.New(ioutil.Discard,
 		"TRACE: ",
 		log.Ldate|log.Ltime|log.Lshortfile)
 
-	Info = log.New(os.Stdout,
+	Info = log.New(infoDest,
 		"INFO: ",
 		log.Ldate|log.Ltime|log.Lshortfile)
 
-	Warning = log.New(os.Stdout,
+	Warning = log.New(infoDest,
 		"WARNING: ",
 		log.Ldate|log.Ltime|log.Lshortfile)
 
-	Error = log.New(io.MultiWriter(errFile),
+	Error = log.New(errorDest,
 		"ERROR: ",
 		log.Ldate|log.Ltime|log.Lshortfile)
 }