From 46e93aeefd3228d414671c3522912c76197bad01 Mon Sep 17 00:00:00 2001 From: Untone Date: Thu, 6 Jun 2024 14:50:29 +0300 Subject: [PATCH] log-inside-post --- server/logs/text.go | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/server/logs/text.go b/server/logs/text.go index 746f9d7..2b2493d 100644 --- a/server/logs/text.go +++ b/server/logs/text.go @@ -16,9 +16,9 @@ func (u LogTextFormatter) Format(e *logrus.Entry) ([]byte, error) { level := strings.ToUpper(e.Level.String()) message := e.Message parts := strings.SplitN(message, " +0000]", 2) - if len(parts) >= 2 { - message = parts[1] - } + if len(parts) >= 2 { + message = parts[1] + } var color string switch e.Level { @@ -34,11 +34,16 @@ func (u LogTextFormatter) Format(e *logrus.Entry) ([]byte, error) { color = "\033[0m" // reset } + var fields string + for key, value := range e.Data { + fields += fmt.Sprintf("%s=%v ", key, value) + } + if e.Caller != nil { file := filepath.Base(e.Caller.File) line := e.Caller.Line - return []byte(fmt.Sprintf("%s[%s] %s:%d %s%s\033[0m\n", color, level, file, line, message, color)), nil + return []byte(fmt.Sprintf("%s[%s] %s:%d %s %s%s\033[0m\n", color, level, file, line, message, fields, color)), nil } - return []byte(fmt.Sprintf("%s[%s] %s%s\033[0m\n", color, level, message, color)), nil + return []byte(fmt.Sprintf("%s[%s] %s %s%s\033[0m\n", color, level, message, fields, color)), nil }