feat: update logger

This commit is contained in:
JustSong 2025-01-31 16:00:53 +08:00
parent d88e07fd9a
commit 605bb06667

View File

@ -7,19 +7,25 @@ import (
"log" "log"
"os" "os"
"path/filepath" "path/filepath"
"runtime"
"strings"
"sync" "sync"
"time" "time"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/songquanpeng/one-api/common/config" "github.com/songquanpeng/one-api/common/config"
"github.com/songquanpeng/one-api/common/helper" "github.com/songquanpeng/one-api/common/helper"
) )
type loggerLevel string
const ( const (
loggerDEBUG = "DEBUG" loggerDEBUG loggerLevel = "DEBUG"
loggerINFO = "INFO" loggerINFO loggerLevel = "INFO"
loggerWarn = "WARN" loggerWarn loggerLevel = "WARN"
loggerError = "ERR" loggerError loggerLevel = "ERROR"
loggerFatal loggerLevel = "FATAL"
) )
var setupLogOnce sync.Once var setupLogOnce sync.Once
@ -44,27 +50,26 @@ func SetupLogger() {
} }
func SysLog(s string) { func SysLog(s string) {
t := time.Now() logHelper(nil, loggerINFO, s)
_, _ = fmt.Fprintf(gin.DefaultWriter, "[SYS] %v | %s \n", t.Format("2006/01/02 - 15:04:05"), s)
} }
func SysLogf(format string, a ...any) { func SysLogf(format string, a ...any) {
SysLog(fmt.Sprintf(format, a...)) logHelper(nil, loggerINFO, fmt.Sprintf(format, a...))
} }
func SysError(s string) { func SysError(s string) {
t := time.Now() logHelper(nil, loggerError, s)
_, _ = fmt.Fprintf(gin.DefaultErrorWriter, "[SYS] %v | %s \n", t.Format("2006/01/02 - 15:04:05"), s)
} }
func SysErrorf(format string, a ...any) { func SysErrorf(format string, a ...any) {
SysError(fmt.Sprintf(format, a...)) logHelper(nil, loggerError, fmt.Sprintf(format, a...))
} }
func Debug(ctx context.Context, msg string) { func Debug(ctx context.Context, msg string) {
if config.DebugEnabled { if !config.DebugEnabled {
logHelper(ctx, loggerDEBUG, msg) return
} }
logHelper(ctx, loggerDEBUG, msg)
} }
func Info(ctx context.Context, msg string) { func Info(ctx context.Context, msg string) {
@ -80,37 +85,65 @@ func Error(ctx context.Context, msg string) {
} }
func Debugf(ctx context.Context, format string, a ...any) { func Debugf(ctx context.Context, format string, a ...any) {
Debug(ctx, fmt.Sprintf(format, a...)) logHelper(ctx, loggerDEBUG, fmt.Sprintf(format, a...))
} }
func Infof(ctx context.Context, format string, a ...any) { func Infof(ctx context.Context, format string, a ...any) {
Info(ctx, fmt.Sprintf(format, a...)) logHelper(ctx, loggerINFO, fmt.Sprintf(format, a...))
} }
func Warnf(ctx context.Context, format string, a ...any) { func Warnf(ctx context.Context, format string, a ...any) {
Warn(ctx, fmt.Sprintf(format, a...)) logHelper(ctx, loggerWarn, fmt.Sprintf(format, a...))
} }
func Errorf(ctx context.Context, format string, a ...any) { func Errorf(ctx context.Context, format string, a ...any) {
Error(ctx, fmt.Sprintf(format, a...)) logHelper(ctx, loggerError, fmt.Sprintf(format, a...))
} }
func logHelper(ctx context.Context, level string, msg string) { func FatalLog(s string) {
logHelper(nil, loggerFatal, s)
}
func FatalLogf(format string, a ...any) {
logHelper(nil, loggerFatal, fmt.Sprintf(format, a...))
}
func logHelper(ctx context.Context, level loggerLevel, msg string) {
writer := gin.DefaultErrorWriter writer := gin.DefaultErrorWriter
if level == loggerINFO { if level == loggerINFO {
writer = gin.DefaultWriter writer = gin.DefaultWriter
} }
id := ctx.Value(helper.RequestIdKey) var logId string
if id == nil { if ctx != nil {
id = helper.GenRequestID() rawLogId := ctx.Value(helper.RequestIdKey)
if rawLogId != nil {
logId = fmt.Sprintf(" | %s", rawLogId.(string))
}
} }
lineInfo, funcName := getLineInfo()
now := time.Now() now := time.Now()
_, _ = fmt.Fprintf(writer, "[%s] %v | %s | %s \n", level, now.Format("2006/01/02 - 15:04:05"), id, msg) _, _ = fmt.Fprintf(writer, "[%s] %v%s%s %s%s \n", level, now.Format("2006/01/02 - 15:04:05"), logId, lineInfo, funcName, msg)
SetupLogger() SetupLogger()
if level == loggerFatal {
os.Exit(1)
}
} }
func FatalLog(v ...any) { func getLineInfo() (string, string) {
t := time.Now() funcName := "[unknown] "
_, _ = fmt.Fprintf(gin.DefaultErrorWriter, "[FATAL] %v | %v \n", t.Format("2006/01/02 - 15:04:05"), v) pc, file, line, ok := runtime.Caller(3)
os.Exit(1) if ok {
if fn := runtime.FuncForPC(pc); fn != nil {
parts := strings.Split(fn.Name(), ".")
funcName = "[" + parts[len(parts)-1] + "] "
}
} else {
file = "unknown"
line = 0
}
parts := strings.Split(file, "one-api/")
if len(parts) > 1 {
file = parts[1]
}
return fmt.Sprintf(" | %s:%d", file, line), funcName
} }