Merge branch 'discours-dev' into discours
All checks were successful
deploy / deploy (push) Successful in 2m5s

This commit is contained in:
Untone 2024-12-11 22:28:34 +03:00
commit c125c89fbf

View File

@ -16,9 +16,9 @@ func (u LogTextFormatter) Format(e *logrus.Entry) ([]byte, error) {
level := strings.ToUpper(e.Level.String()) level := strings.ToUpper(e.Level.String())
message := e.Message message := e.Message
parts := strings.SplitN(message, " +0000]", 2) parts := strings.SplitN(message, " +0000]", 2)
if len(parts) >= 2 { if len(parts) >= 2 {
message = parts[1] message = parts[1]
} }
var color string var color string
switch e.Level { switch e.Level {
@ -34,11 +34,16 @@ func (u LogTextFormatter) Format(e *logrus.Entry) ([]byte, error) {
color = "\033[0m" // reset color = "\033[0m" // reset
} }
var fields string
for key, value := range e.Data {
fields += fmt.Sprintf("%s=%v ", key, value)
}
if e.Caller != nil { if e.Caller != nil {
file := filepath.Base(e.Caller.File) file := filepath.Base(e.Caller.File)
line := e.Caller.Line 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
} }