```

feat(file): add thread safety and improve log rolling functionality

- Add sync.Mutex to FileAppender for thread-safe operations
- Implement proper mutex locking in start() goroutine to prevent
  race conditions during file operations
- Return boolean from checkAndRoll() method to indicate if rolling occurred
- Add MaxCount field to limit number of archived log files
- Implement cleanup of old log files exceeding MaxCount limit
- Add proper error handling for file rename operations
- Track current file size using WriteString return values

refactor(format): update formatting functions with better type safety

- Change isFormatString parameter

Co-authored-by: Copilot <copilot@github.com>

README.md

@@ -1,3 +1,77 @@
 # gologger
 
-a logger used in go
+GoLogger 是一个简单但功能强大的 Go 语言日志库，提供灵活的日志记录功能。它支持多种日志输出方式（控制台、文件等），并允许自定义日志格式。
+
+## 特性
+- 支持多种日志级别：ERROR, WARN, INFO, DEBUG, TRACE
+- 支持多种输出方式：控制台、文件（支持滚动策略）
+- 可定制日志格式
+- 支持按类别记录日志
+
+## 安装
+```bash
+go get github.com/yourusername/gologger
+```
+
+## 快速开始
+```go
+package main
+
+import (
+	"github.com/yourusername/gologger"
+)
+
+func main() {
+	// 获取默认logger
+	logger := gologger.GetLogger("main")
+
+	// 设置全局日志级别
+	gologger.Configure(gologger.LoggersConfig{
+		Level: "info",
+		Appenders: []gologger.LogAppenderConfig{
+			{
+				Type: "console",
+			},
+			{
+				Type: "file",
+				Options: map[string]interface{}{
+					"filePath": "app.log",
+					"EnableRolling": true,
+					"MaxSize": 1024 * 1024 * 10, // 10MB
+				},
+			},
+		},
+	})
+
+	// 记录日志
+	logger.Info("Application started")
+	logger.Error("An error occurred")
+}
+```
+
+## 配置说明
+
+### 日志级别
+支持的级别包括：off, error, warn, info, debug, trace
+
+### 输出方式（Appenders）
+
+1. **ConsoleAppender** - 控制台输出
+   配置示例：
+   ```go
+   {
+	Type: "console",
+   }
+   ```
+
+2. **FileAppender** - 文件输出，支持滚动策略
+   配置参数：
+   - filePath: 日志文件路径
+   - EnableRolling: 是否启用滚动（默认true）
+   - MaxSize: 单个文件最大大小（字节，默认10MB）
+   - MaxAge: 文件最大保存时间（秒，默认86400秒=24小时）
+
+### 格式化器
+可以通过SelectFormatter选择不同的日志格式：
+- simple: 简单格式 `[timestamp] level : category - message`
+- json: JSON 格式输出

console.go

@@ -4,6 +4,18 @@ import (
 	"fmt"
 )
 
+// ConsoleAppender implements the LoggerAppender interface for console output.
+// It uses color-coded templates for different log levels.
+// Example:
+//  appender := &ConsoleAppender{
+//    formatter: NewSimpleFormatter(),
+//  }
+//  appender.Append(event)
+//  appender.Close()
+type ConsoleAppender struct {
+	formatter LogFormatter
+}
+
 const (
 	ErrorTemplate = "\033[1;31m%s\033[0m"
 	WarnTemplate  = "\033[1;33m%s\033[0m"
@@ -12,10 +24,6 @@ const (
 	TraceTemplate = "\033[1;35m%s\033[0m"
 )
 
-type ConsoleAppender struct {
-	formatter LogFormatter
-}
-
 // Close implements LoggerAppender.
 func (c *ConsoleAppender) Close() {
 

file.go

@@ -4,20 +4,37 @@ import (
 	"os"
 	"path/filepath"
 	"regexp"
+	"sort"
 	"strconv"
+	"strings"
+	"sync"
 	"time"
 )
 
+// FileAppender implements the LoggerAppender interface for file output.
+// It supports log rotation based on file size and age.
+// Example:
+//
+//	appender := &FileAppender{
+//	  formatter: NewSimpleFormatter(),
+//	  filePath: "app.log",
+//	  EnableRolling: true,
+//	  MaxSize: 1024 * 1024 * 10, // 10MB
+//	}
+//	appender.Append(event)
+//	appender.Close()
 type FileAppender struct {
 	formatter LogFormatter
 	filePath  string
 	lchan     chan LogEvent
 	file      *os.File
 	stopChan  chan struct{}
+	mu        sync.Mutex
 	// 新增滚动相关字段
 	EnableRolling   bool
 	MaxSize         int64 // 文件最大大小(字节)
 	MaxAge          int64 // 文件最大时间(秒)
+	MaxCount        int   // 最大文件数量
 	currentFileSize int64 // 当前文件大小
 	createdAt       int64 // 文件创建时间戳
 }
@@ -52,57 +69,98 @@ func (f *FileAppender) start() {
 	}
 
 	go func() {
-		defer f.file.Close()
 		for {
 			select {
 			case <-f.stopChan:
+				f.mu.Lock()
+				if f.file != nil {
+					f.file.Close()
+				}
+				f.mu.Unlock()
 				return
 			case logEvent := <-f.lchan:
+				f.mu.Lock()
 				// 检查日志滚动
 				if f.EnableRolling {
-					f.checkAndRoll(logEvent)
+					if f.checkAndRoll(logEvent) {
+						f.mu.Unlock()
+						continue
+					}
 				}
 				logMsg := f.formatter(logEvent)
-				f.file.WriteString(logMsg)
+				n, err := f.file.WriteString(logMsg)
+				if err == nil {
+					f.currentFileSize += int64(n)
+				}
+				f.mu.Unlock()
 			}
 		}
 	}()
 }
 
-// 新增日志滚动方法
-func (f *FileAppender) checkAndRoll(logEvent LogEvent) {
+// 新增日志滚动方法，返回是否进行了滚动
+func (f *FileAppender) checkAndRoll(logEvent LogEvent) bool {
 	// 按大小滚动
 	if f.MaxSize > 0 && f.currentFileSize >= f.MaxSize {
 		f.rollFile(logEvent)
-		return
+		return true
 	}
 
 	// 按时间滚动
 	if f.MaxAge > 0 && time.Now().Unix()-f.createdAt >= f.MaxAge {
 		f.rollFile(logEvent)
+		return true
 	}
+	return false
 }
 
 // 日志文件滚动
 func (f *FileAppender) rollFile(logEvent LogEvent) {
 	// 关闭当前文件
-	f.file.Close()
+	if f.file != nil {
+		f.file.Close()
+	}
 
 	// 重命名旧文件
 	timestamp := time.Now().Format("20060102150405")
 	newPath := f.filePath + "." + timestamp
-	os.Rename(f.filePath, newPath)
+	if err := os.Rename(f.filePath, newPath); err != nil {
+		// 重命名失败，直接创建新文件
+		f.file, _ = os.OpenFile(f.filePath, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
+		return
+	}
 
 	// 创建新文件
-	f.file, _ = os.OpenFile(f.filePath, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
+	var err error
+	f.file, err = os.OpenFile(f.filePath, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
+	if err != nil {
+		return
+	}
 
 	// 重置状态
 	f.currentFileSize = 0
 	f.createdAt = time.Now().Unix()
 
 	// 重新写入当前日志
-	logMsg := format(logEvent)
-	f.file.WriteString(logMsg)
+	logMsg := f.formatter(logEvent)
+	if _, err := f.file.WriteString(logMsg); err == nil {
+		f.currentFileSize += int64(len(logMsg))
+	}
+
+	// 清理超过MaxCount的旧文件
+	if f.MaxCount > 0 {
+		logDir := filepath.Dir(newPath)
+		logFileBase := filepath.Base(f.filePath)
+		files, _ := filepath.Glob(logDir + "/" + logFileBase + ".*")
+		if len(files) > f.MaxCount {
+			sort.Slice(files, func(i, j int) bool {
+				return files[i] < files[j]
+			})
+			for i := 0; i < len(files)-f.MaxCount; i++ {
+				os.Remove(files[i])
+			}
+		}
+	}
 }
 
 func (f *FileAppender) Append(logEvent LogEvent) {
@@ -111,9 +169,7 @@ func (f *FileAppender) Append(logEvent LogEvent) {
 }
 
 func makeFileAppender(appenderConfig LogAppenderConfig) *LoggerAppender {
-	var logfile interface{}
-	var ok bool
-	logfile, ok = appenderConfig.Options["file"]
+	logfile, ok := appenderConfig.Options["file"]
 	if !ok {
 		logfile = "default.log"
 	}
@@ -156,16 +212,16 @@ func makeFileAppender(appenderConfig LogAppenderConfig) *LoggerAppender {
 		re := regexp.MustCompile(`^\d+[hd]?$`)
 		if re.MatchString(ageStr) {
 			// 提取数字部分和单位
-			numStr := ""
+			var numStr strings.Builder
 			unit := ""
 			for _, c := range ageStr {
 				if c >= '0' && c <= '9' {
-					numStr += string(c)
+					numStr.WriteRune(c)
 				} else {
 					unit = string(c)
 				}
 			}
-			num, _ := strconv.ParseInt(numStr, 10, 64)
+			num, _ := strconv.ParseInt(numStr.String(), 10, 64)
 			switch unit {
 			case "h":
 				maxAge = num * 3600 // 小时转秒

format.go

@@ -1,3 +1,5 @@
+// Package gologger provides a simple logging implementation with multiple appenders and formatters.
+// It supports console, file, and HTTP logging with customizable formats.
 package gologger
 
 import (
@@ -6,22 +8,32 @@ import (
 	"strings"
 )
 
-const logTemplate = "[%s] %s : %s - %s\n"
-
+// LogFormatter is a function type that formats a LogEvent into a string.
+// Example:
+//
+//	formatter := func(event LogEvent) string {
+//	  return fmt.Sprintf("[%s] %s: %v", event.Ts.Format("2006-01-02"), event.Level, event.Data)
+//	}
 type LogFormatter = func(LogEvent) string
 
+const logTemplate = "[%s] %s : %s - %s\n"
+
+// format is the default formatter that converts a LogEvent to a string using the default template.
+// It handles both simple values and formatted strings.
+// Template: "[timestamp] level : category - data"
 func format(logEvent LogEvent) string {
 	data := logEvent.Ts.Format("2006-01-02 15:04:05")
-	msg := ""
-	firstMsg := logEvent.Data[0]
-	if isFormatString(firstMsg) {
-		msg = fmt.Sprintf(firstMsg.(string), logEvent.Data[1:]...)
-	} else {
-		msg = sprint(logEvent.Data)
+	var msg string
+	if len(logEvent.Data) > 0 {
+		firstMsg := logEvent.Data[0]
+		if isFormatString(firstMsg) {
+			msg = fmt.Sprintf(firstMsg.(string), logEvent.Data[1:]...)
+		} else {
+			msg = sprint(logEvent.Data)
+		}
 	}
 
-	ret := fmt.Sprintf(logTemplate, data, logEvent.Category, getLogLevelStr(logEvent.Level), msg)
-	return ret
+	return fmt.Sprintf(logTemplate, data, logEvent.Category, getLogLevelStr(logEvent.Level), msg)
 }
 
 func getLogLevelStr(level int) string {
@@ -33,34 +45,35 @@ func getLogLevelStr(level int) string {
 	return "Unknown"
 }
 
-func isFormatString(f interface{}) bool {
+func isFormatString(f any) bool {
 	s, ok := f.(string)
 	if !ok {
 		return false
 	}
-	// 尝试使用空接口来格式化字符串
-	m := fmt.Sprintf(s, []interface{}{}...)
-	return strings.Contains(m, "MISSING")
+	// 检查是否包含常见格式化动词
+	return strings.Contains(s, "%s") || strings.Contains(s, "%d") ||
+		strings.Contains(s, "%v") || strings.Contains(s, "%f") ||
+		strings.Contains(s, "%x") || strings.Contains(s, "%t") ||
+		strings.Contains(s, "%c") || strings.Contains(s, "%b") ||
+		strings.Contains(s, "%e") || strings.Contains(s, "%g")
 }
 
-func sprint(s []interface{}) string {
-	str := make([]any, len(s))
+func sprint(s []any) string {
+	var b strings.Builder
 	for i, v := range s {
 		if i > 0 {
-			str[i] = fmt.Sprintf(" %v", v)
-		} else {
-			str[i] = fmt.Sprintf("%v", v)
+			b.WriteString(" ")
 		}
+		fmt.Fprintf(&b, "%v", v)
 	}
-	return fmt.Sprint(str...)
+	return b.String()
 }
 
 func jsonFormatter(logEvent LogEvent) string {
-	_, err := json.Marshal(logEvent.Data)
+	d, err := json.Marshal(logEvent)
 	if err != nil {
-		logEvent.Data = []interface{}{fmt.Sprintf("%v", logEvent.Data)}
+		return fmt.Sprintf(`{"error":"%v"}`, logEvent.Data)
 	}
-	d, _ := json.Marshal(logEvent)
 	return string(d)
 }
 

go.mod

@@ -1,3 +1,3 @@
-module git.pyer.club/kingecg/gologger
+module git.kingecg.top/kingecg/gologger
 
 go 1.19

main.go

@@ -1,7 +1,10 @@
+// Package gologger provides a simple logging implementation with multiple appenders and formatters.
+// It supports console, file, and HTTP logging with customizable formats.
 package gologger
 
 import (
 	"strings"
+	"sync"
 	"time"
 )
 
@@ -25,7 +28,22 @@ var logLevelMap map[string]int = map[string]int{
 var loggerMap map[string]*Logger = map[string]*Logger{}
 var appenderFactoryMap map[string]func(LogAppenderConfig) *LoggerAppender = map[string]func(LogAppenderConfig) *LoggerAppender{}
 var appenders map[string]*LoggerAppender = map[string]*LoggerAppender{}
-var loggerConfig LoggersConfig
+var mu sync.RWMutex
+var loggerConfig LoggersConfig = LoggersConfig{
+	Appenders: map[string]LogAppenderConfig{
+		"console": {
+			Type:      "console",
+			Formatter: "text",
+			Options:   map[string]interface{}{},
+		},
+	},
+	Categories: map[string]LogConfig{
+		"default": {
+			Level:     "error",
+			Appenders: []string{"console"},
+		},
+	},
+}
 
 type LogAppenderConfig struct {
 	Type      string                 `json:"type"`
@@ -41,6 +59,14 @@ type LoggersConfig struct {
 	Appenders  map[string]LogAppenderConfig `json:"appenders"`
 	Categories map[string]LogConfig         `json:"categories"`
 }
+
+// Logger represents a logger instance for a specific category.
+// It maintains the log level and appenders for that category.
+// Example:
+//
+//	logger := GetLogger("mycategory")
+//	logger.Info("This is an info message")
+//	logger.Error("This is an error message")
 type Logger struct {
 	category  string
 	level     int
@@ -100,21 +126,24 @@ func (l *Logger) Trace(msg ...interface{}) {
 	l.log(Trace, msg)
 }
 func GetLogger(name string) *Logger {
+	mu.RLock()
 	if logger, ok := loggerMap[name]; ok {
+		mu.RUnlock()
 		return logger
-	} else {
-		logConfig, ok := loggerConfig.Categories[name]
-		if ok {
-			return makeLogger(name, logConfig)
-		}
-		if name == "default" {
-			return defaultLogger
-		}
-		l := *GetLogger("default")
-		l.category = name
-		loggerMap[name] = &l
-		return &l
 	}
+	mu.RUnlock()
+
+	logConfig, ok := loggerConfig.Categories[name]
+	if !ok {
+		logConfig = loggerConfig.Categories["default"]
+	}
+	l := makeLogger(name, logConfig)
+	l.category = name
+
+	mu.Lock()
+	loggerMap[name] = l
+	mu.Unlock()
+	return l
 }
 
 func makeLogger(name string, config LogConfig) *Logger {
@@ -133,22 +162,57 @@ func makeLogger(name string, config LogConfig) *Logger {
 	loggerMap[name] = logger
 	return logger
 }
-func Configure(config LoggersConfig) {
+
+func ReconfigLoggers(config LoggersConfig) {
+	validateConfig(config)
+
+	mu.Lock()
+	defer mu.Unlock()
+
 	loggerConfig = config
 	for name, appenderConfig := range loggerConfig.Appenders {
-		appenderFactory, ok := appenderFactoryMap[appenderConfig.Type]
-		if ok {
+		if oldappender, ok := appenders[name]; ok {
+			(*oldappender).Close()
+		}
+		if appenderFactory, ok := appenderFactoryMap[appenderConfig.Type]; ok {
 			appenders[name] = appenderFactory(appenderConfig)
 		} else {
 			appenders[name] = &consoleAppender
 		}
 	}
-	for name, _ := range loggerConfig.Categories {
-		GetLogger(name)
+	for name, logger := range loggerMap {
+		logConfig, ok := loggerConfig.Categories[name]
+		if !ok {
+			logConfig = loggerConfig.Categories["default"]
+		}
+		logger.level = logLevelMap[strings.ToLower(logConfig.Level)]
+		if len(logConfig.Appenders) == 0 {
+			logger.appenders = []*LoggerAppender{&consoleAppender}
+		} else {
+			logger.appenders = make([]*LoggerAppender, len(logConfig.Appenders))
+			for i, appenderName := range logConfig.Appenders {
+				logger.appenders[i] = appenders[appenderName]
+			}
+		}
 	}
 }
+func validateConfig(config LoggersConfig) {
+	_, ok := loggerConfig.Categories["default"]
+	if !ok {
+		panic("default logger config not found")
+	}
+}
+func Configure(config LoggersConfig) {
+	validateConfig(config)
+	ReconfigLoggers(config)
+}
 
 func RegistAppender(typeName string, appenderCreatCb func(LogAppenderConfig) *LoggerAppender) {
 
 	appenderFactoryMap[typeName] = appenderCreatCb
 }
+
+func init() {
+	loggerMap["default"] = defaultLogger
+	appenders["console"] = &consoleAppender
+}

main_test.go

@@ -5,6 +5,12 @@ import "testing"
 
 func TestGetLogger(t *testing.T) {
 	// Initialize loggerMap and loggerConfig
+
+	dl := GetLogger("default")
+	if dl != defaultLogger {
+		t.Errorf("GetLogger(\"defult\") should return defaultLogger")
+	}
+	dl.Error("test")
 	Configure(LoggersConfig{
 		Appenders: map[string]LogAppenderConfig{
 			"console": {
@@ -24,12 +30,10 @@ func TestGetLogger(t *testing.T) {
 			},
 		},
 	})
-	dl := GetLogger("default")
-	// if dl != defaultLogger {
-	// 	t.Errorf("GetLogger(\"defult\") should return defaultLogger")
-	// }
-	dl.Error("test")
-
+	dl.Info("test")
+	if dl.level != Info {
+		t.Errorf("GetLogger(\"default\") should return defaultLogger")
+	}
 	al := GetLogger("app")
 
 	if al == dl {

test/main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	logger "git.pyer.club/kingecg/gologger"
+	logger "git.kingecg.top/kingecg/gologger"
 )
 
 func aqmain() {