JOJ/JOJ3
25
6
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

feat(cmd/joj3): only log attrs in debug file
Some checks failed
build / build (push) Failing after 0s
Details
build / trigger-build-image (push) Has been skipped
Details
submodules sync / sync (push) Failing after 0s
Details

Browse Source
This commit is contained in:
张泊明518370910136 2025-01-28 03:16:15 -05:00
parent 950708cd11
commit ce15a4fa89
Signed by: 张泊明518370910136
GPG Key ID: D47306D7062CDA9D
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/joj3/log.go
View File

@ -53,7 +53,7 @@ func (h *multiHandler) WithGroup(name string) slog.Handler {
return &multiHandler{handlers: handlers} return &multiHandler{handlers: handlers}
} }
func getSlogAttrs(csvPath string) (attrs []slog.Attr) { func newSlogAttrs(csvPath string) (attrs []slog.Attr) {
attrs = []slog.Attr{ attrs = []slog.Attr{
slog.String("runID", env.Attr.RunID), slog.String("runID", env.Attr.RunID),
slog.String("confName", env.Attr.ConfName), slog.String("confName", env.Attr.ConfName),
@ -108,6 +108,7 @@ func getSlogAttrs(csvPath string) (attrs []slog.Attr) {
func setupSlog(conf *conf.Conf) error { func setupSlog(conf *conf.Conf) error {
logPath := conf.LogPath logPath := conf.LogPath
attrs := newSlogAttrs(conf.ActorCsvPath)
handlers := []slog.Handler{} handlers := []slog.Handler{}
if logPath != "" { if logPath != "" {
// Text file handler for debug logs // Text file handler for debug logs
@ -118,7 +119,7 @@ func setupSlog(conf *conf.Conf) error {
} }
debugTextHandler := slog.NewTextHandler(debugTextFile, debugTextHandler := slog.NewTextHandler(debugTextFile,
&slog.HandlerOptions{Level: slog.LevelDebug}) &slog.HandlerOptions{Level: slog.LevelDebug})
handlers = append(handlers, debugTextHandler) handlers = append(handlers, debugTextHandler.WithAttrs(attrs))
// Json file handler for debug logs // Json file handler for debug logs
debugJsonFile, err := os.OpenFile(logPath+".ndjson", debugJsonFile, err := os.OpenFile(logPath+".ndjson",
os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0o640) os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0o640)
@ -127,7 +128,7 @@ func setupSlog(conf *conf.Conf) error {
} }
debugJsonHandler := slog.NewJSONHandler(debugJsonFile, debugJsonHandler := slog.NewJSONHandler(debugJsonFile,
&slog.HandlerOptions{Level: slog.LevelDebug}) &slog.HandlerOptions{Level: slog.LevelDebug})
handlers = append(handlers, debugJsonHandler) handlers = append(handlers, debugJsonHandler.WithAttrs(attrs))
} }
stderrLogLevel := slog.LevelInfo stderrLogLevel := slog.LevelInfo
if runningTest { if runningTest {
@ -138,19 +139,10 @@ func setupSlog(conf *conf.Conf) error {
Level: stderrLogLevel, Level: stderrLogLevel,
}) })
handlers = append(handlers, stderrHandler) handlers = append(handlers, stderrHandler)
if runningTest {
stderrJSONHandler := slog.NewJSONHandler(os.Stderr, &slog.HandlerOptions{
Level: stderrLogLevel,
})
handlers = append(handlers, stderrJSONHandler)
}
// Create a multi-handler // Create a multi-handler
multiHandler := &multiHandler{handlers: handlers} multiHandler := &multiHandler{handlers: handlers}
multiHandlerWithAttrs := multiHandler.WithAttrs(
getSlogAttrs(conf.ActorCsvPath),
)
// Set the default logger // Set the default logger
logger := slog.New(multiHandlerWithAttrs) logger := slog.New(multiHandler)
slog.SetDefault(logger) slog.SetDefault(logger)
if logPath != "" { if logPath != "" {
slog.Info("debug log", "path", logPath) slog.Info("debug log", "path", logPath)