logutil: print error from WithError if found

Signed-off-by: Justin Chadwell <me@jedevc.com>
This commit is contained in:
Justin Chadwell 2023-05-30 10:00:24 +01:00
parent 17bdbbd3c3
commit 5788ab33d2
1 changed files with 8 additions and 1 deletions

View File

@ -1,6 +1,7 @@
package logutil package logutil
import ( import (
"bytes"
"fmt" "fmt"
"strings" "strings"
@ -12,5 +13,11 @@ type Formatter struct {
} }
func (f *Formatter) Format(entry *logrus.Entry) ([]byte, error) { func (f *Formatter) Format(entry *logrus.Entry) ([]byte, error) {
return []byte(fmt.Sprintf("%s: %s\n", strings.ToUpper(entry.Level.String()), entry.Message)), nil msg := bytes.NewBuffer(nil)
fmt.Fprintf(msg, "%s: %s", strings.ToUpper(entry.Level.String()), entry.Message)
if v, ok := entry.Data[logrus.ErrorKey]; ok {
fmt.Fprintf(msg, ": %v", v)
}
fmt.Fprintf(msg, "\n")
return msg.Bytes(), nil
} }