diff --git a/log/handler.go b/log/handler.go index 889db07..ef6a215 100644 --- a/log/handler.go +++ b/log/handler.go @@ -1,10 +1,10 @@ package log import ( - "log/slog" - "io" - "path/filepath" "context" + "io" + "log/slog" + "path/filepath" "runtime" "runtime/debug" "sync" @@ -35,21 +35,21 @@ type OriginJsonHandler struct { func getStrLevel(level slog.Level) string{ switch level { case LevelTrace: - return "TRACE" + return "Trace" case LevelDebug: - return "DEBUG" + return "Debug" case LevelInfo: - return "INFO" + return "Info" case LevelWarning: - return "WARNING" + return "Warning" case LevelError: - return "ERROR" + return "Error" case LevelStack: - return "STACK" + return "Stack" case LevelDump: - return "DUMP" + return "Dump" case LevelFatal: - return "FATAL" + return "Fatal" } return "" @@ -97,7 +97,8 @@ func (oh *OriginTextHandler) Handle(context context.Context, record slog.Record) oh.w.Write([]byte(strDump)) return err } - + + return oh.TextHandler.Handle(context, record) } diff --git a/log/log.go b/log/log.go index f80542a..7158fd2 100644 --- a/log/log.go +++ b/log/log.go @@ -489,23 +489,8 @@ func (logger *Logger) formatHeader(buf *Buffer,level slog.Level,calldepth int) { file = filepath.Base(file) buf.AppendString("time=\"") - year, month, day := t.Date() - buf.AppendInt(int64(year)) - buf.AppendByte('/') - buf.AppendInt(int64(month)) - buf.AppendByte('/') - buf.AppendInt(int64(day)) - buf.AppendByte(' ') - - hour, min, sec := t.Clock() - buf.AppendInt(int64(hour)) - buf.AppendByte(':') - buf.AppendInt(int64(min)) - buf.AppendByte(':') - - buf.AppendInt(int64(sec)) + buf.AppendString(t.Format("2006/01/02 15:04:05")) buf.AppendString("\"") - logger.sBuff.AppendString(" level=") logger.sBuff.AppendString(getStrLevel(level)) logger.sBuff.AppendString(" source=")