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

Clean up text_formatter code with a byte.Buffer

This commit is contained in:
Aaron L 2014-05-24 07:46:03 -07:00
parent 13600d2325
commit 0d1e231957
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
text_formatter.go
View File

@ -1,6 +1,7 @@
package logrus package logrus
import ( import (
"bytes"
"fmt" "fmt"
"sort" "sort"
"strings" "strings"
@ -29,7 +30,7 @@ type TextFormatter struct {
} }
func (f *TextFormatter) Format(entry *Entry) ([]byte, error) { func (f *TextFormatter) Format(entry *Entry) ([]byte, error) {
var serialized []byte b := &bytes.Buffer{}
if f.ForceColors || IsTerminal() { if f.ForceColors || IsTerminal() {
levelText := strings.ToUpper(entry.Data["level"].(string))[0:4] levelText := strings.ToUpper(entry.Data["level"].(string))[0:4]
@ -44,7 +45,7 @@ func (f *TextFormatter) Format(entry *Entry) ([]byte, error) {
levelColor = red levelColor = red
} }
serialized = append(serialized, []byte(fmt.Sprintf("\x1b[%dm%s\x1b[0m[%04d] %-45s ", levelColor, levelText, miniTS(), entry.Data["msg"]))...) fmt.Fprintf(b, "\x1b[%dm%s\x1b[0m[%04d] %-44s ", levelColor, levelText, miniTS(), entry.Data["msg"])
keys := make([]string, 0) keys := make([]string, 0)
for k, _ := range entry.Data { for k, _ := range entry.Data {
@ -53,35 +54,30 @@ func (f *TextFormatter) Format(entry *Entry) ([]byte, error) {
} }
} }
sort.Strings(keys) sort.Strings(keys)
first := true
for _, k := range keys { for _, k := range keys {
v := entry.Data[k] v := entry.Data[k]
if first { fmt.Fprintf(b, " \x1b[%dm%s\x1b[0m=%v", levelColor, k, v)
first = false
} else {
serialized = append(serialized, ' ')
}
serialized = append(serialized, []byte(fmt.Sprintf("\x1b[%dm%s\x1b[0m=%v", levelColor, k, v))...)
} }
} else { } else {
serialized = f.AppendKeyValue(serialized, "time", entry.Data["time"].(string)) f.AppendKeyValue(b, "time", entry.Data["time"].(string))
serialized = f.AppendKeyValue(serialized, "level", entry.Data["level"].(string)) f.AppendKeyValue(b, "level", entry.Data["level"].(string))
serialized = f.AppendKeyValue(serialized, "msg", entry.Data["msg"].(string)) f.AppendKeyValue(b, "msg", entry.Data["msg"].(string))
for key, value := range entry.Data { for key, value := range entry.Data {
if key != "time" && key != "level" && key != "msg" { if key != "time" && key != "level" && key != "msg" {
serialized = f.AppendKeyValue(serialized, key, value) f.AppendKeyValue(b, key, value)
} }
} }
} }
return append(serialized, '\n'), nil b.WriteByte('\n')
return b.Bytes(), nil
} }
func (f *TextFormatter) AppendKeyValue(serialized []byte, key, value interface{}) []byte { func (f *TextFormatter) AppendKeyValue(b *bytes.Buffer, key, value interface{}) {
if _, ok := value.(string); ok { if _, ok := value.(string); ok {
return append(serialized, []byte(fmt.Sprintf("%v=%q ", key, value))...) fmt.Fprintf(b, "%v=%q ", key, value)
} else { } else {
return append(serialized, []byte(fmt.Sprintf("%v=%v ", key, value))...) fmt.Fprintf(b, "%v=%v ", key, value)
} }
} }