mirror
/
logrus
mirror of https://github.com/sirupsen/logrus.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

text_formatter: change to simpler k-v when no tty

This commit is contained in:
Simon Eskildsen 2014-03-14 13:01:06 -04:00
parent ddcbea3dba
commit 1000975e52
1 changed files with 61 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
text_formatter.go
View File

@ -4,6 +4,7 @@ import (
"fmt"
"os"
"sort"
"strconv"
"strings"
"github.com/burke/ttyutils"
@ -23,7 +24,9 @@ type TextFormatter struct {
func (f *TextFormatter) Format(entry *Entry) ([]byte, error) {
var serialized []byte
if ttyutils.IsTerminal(os.Stdout.Fd()) {
levelText := strings.ToUpper(entry.Data["level"].(string))[0:4]
levelColor := blue
if entry.Data["level"] == "warning" {
@ -33,9 +36,7 @@ func (f *TextFormatter) Format(entry *Entry) ([]byte, error) {
levelColor = red
}
if ttyutils.IsTerminal(os.Stdout.Fd()) {
serialized = append(serialized, []byte(fmt.Sprintf("\x1b[%dm%s\x1b[0m[%04d] %-45s ", levelColor, levelText, miniTS(), entry.Data["msg"]))...)
}
keys := make([]string, 0)
for k, _ := range entry.Data {
@ -54,6 +55,40 @@ func (f *TextFormatter) Format(entry *Entry) ([]byte, error) {
}
serialized = append(serialized, []byte(fmt.Sprintf("\x1b[%dm%s\x1b[0m=%v", levelColor, k, v))...)
}
} else {
serialized = f.AppendKeyValue(serialized, "time", entry.Data["time"].(string))
serialized = f.AppendKeyValue(serialized, "level", entry.Data["level"].(string))
serialized = f.AppendKeyValue(serialized, "msg", entry.Data["msg"].(string))
for key, value := range entry.Data {
if key != "time" && key != "level" && key != "msg" {
serialized = append(serialized, []byte(fmt.Sprintf("%s=%s ",
f.ToString(key, false), f.ToString(value, true)))...)
}
}
}
return append(serialized, '\n'), nil
}
func (f *TextFormatter) AppendKeyValue(serialized []byte, key, value string) []byte {
return append(serialized, []byte(fmt.Sprintf("%s=%s ",
f.ToString(key, false), f.ToString(value, true)))...)
}
func (f *TextFormatter) ToString(value interface{}, escapeStrings bool) string {
switch value.(type) {
default:
if escapeStrings {
return fmt.Sprintf("'%s'", value)
} else {
return fmt.Sprintf("%s", value)
}
case int:
return fmt.Sprintf("%s", strconv.Itoa(value.(int)))
case uint64:
return fmt.Sprintf("%s", strconv.FormatUint(value.(uint64), 10))
case bool:
return fmt.Sprintf("%s", strconv.FormatBool(value.(bool)))
}
}