tcjlj/OpenFlare
1
0
Fork 0
mirror of https://github.com/Rain-kl/OpenFlare.git synced 2026-10-06 07:36:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

[修复] GIN日志打印等级统一

Browse Source
This commit is contained in:
ryan
2026-03-13 12:25:51 +08:00
parent c3f8bd20b3
commit 6b91dd8f3d
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+1 -1
View File
@@ -108,7 +108,6 @@ Origin
services: services:
atsflare: atsflare:
image: ghcr.io/rain-kl/atsflare:latest image: ghcr.io/rain-kl/atsflare:latest
container_name: atsflare
restart: unless-stopped restart: unless-stopped
ports: ports:
- "3000:3000" - "3000:3000"
@@ -116,6 +115,7 @@ services:
SESSION_SECRET: replace-with-random-string SESSION_SECRET: replace-with-random-string
SQLITE_PATH: /data/atsflare.db SQLITE_PATH: /data/atsflare.db
GIN_MODE: release GIN_MODE: release
LOG_LEVEL: info
PORT: "3000" PORT: "3000"
volumes: volumes:
- atsflare-data:/data - atsflare-data:/data
atsf_server/common/logger.go
+18 -5
View File
@@ -22,6 +22,17 @@ const (
var currentLogLevel = logLevelInfo var currentLogLevel = logLevelInfo
var currentLogLevelName = "info" var currentLogLevelName = "info"
var commonLogWriter io.Writer = os.Stdout
var errorLogWriter io.Writer = os.Stderr
func configureGinWriters() {
if shouldLog(logLevelDebug) {
gin.DefaultWriter = commonLogWriter
} else {
gin.DefaultWriter = io.Discard
}
gin.DefaultErrorWriter = errorLogWriter
}
func SetLogLevel(level string) { func SetLogLevel(level string) {
normalized := strings.TrimSpace(strings.ToLower(level)) normalized := strings.TrimSpace(strings.ToLower(level))
@@ -39,6 +50,7 @@ func SetLogLevel(level string) {
currentLogLevel = logLevelInfo currentLogLevel = logLevelInfo
currentLogLevelName = "info" currentLogLevelName = "info"
} }
configureGinWriters()
} }
func GetLogLevel() string { func GetLogLevel() string {
@@ -61,9 +73,10 @@ func SetupGinLog() {
if err != nil { if err != nil {
log.Fatal("failed to open log file") log.Fatal("failed to open log file")
} }
gin.DefaultWriter = io.MultiWriter(os.Stdout, commonFd) commonLogWriter = io.MultiWriter(os.Stdout, commonFd)
gin.DefaultErrorWriter = io.MultiWriter(os.Stderr, errorFd) errorLogWriter = io.MultiWriter(os.Stderr, errorFd)
} }
configureGinWriters()
} }
func SysLog(s string) { func SysLog(s string) {
@@ -71,7 +84,7 @@ func SysLog(s string) {
return return
} }
t := time.Now() t := time.Now()
_, _ = fmt.Fprintf(gin.DefaultWriter, "[SYS] %v | %s \n", t.Format("2006/01/02 - 15:04:05"), s) _, _ = fmt.Fprintf(commonLogWriter, "[SYS] %v | %s \n", t.Format("2006/01/02 - 15:04:05"), s)
} }
func SysError(s string) { func SysError(s string) {
@@ -79,11 +92,11 @@ func SysError(s string) {
return return
} }
t := time.Now() t := time.Now()
_, _ = fmt.Fprintf(gin.DefaultErrorWriter, "[SYS] %v | %s \n", t.Format("2006/01/02 - 15:04:05"), s) _, _ = fmt.Fprintf(errorLogWriter, "[SYS] %v | %s \n", t.Format("2006/01/02 - 15:04:05"), s)
} }
func FatalLog(v ...any) { func FatalLog(v ...any) {
t := time.Now() t := time.Now()
_, _ = fmt.Fprintf(gin.DefaultErrorWriter, "[FATAL] %v | %v \n", t.Format("2006/01/02 - 15:04:05"), v) _, _ = fmt.Fprintf(errorLogWriter, "[FATAL] %v | %v \n", t.Format("2006/01/02 - 15:04:05"), v)
os.Exit(1) os.Exit(1)
} }