gopkg/logrus
2
0
Fork 0
Code Pull Requests Activity

make sure no leading or trailing spaces

Browse Source 
This changed printColored and printKeyValue to print in same way
with prefix space instead of trailing space, to make it easier
to slice out when returning in Format;
The test cases are to make sure msg formartting doesn't include
leading or trailing spaces;

Closes #99

Signed-off-by: Derek Che <drc@yahoo-inc.com>
This commit is contained in:
Derek Che
2015-01-04 00:46:15 +00:00
parent a243bbaa0b
commit dcbe8d66af
2 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
text_formatter.go
+5 -5
View File
@@ -69,7 +69,7 @@ func (f *TextFormatter) Format(entry *Entry) ([]byte, error) {
}
b.WriteByte('\n')
return b.Bytes(), nil
return b.Bytes()[1:], nil
}
func printColored(b *bytes.Buffer, entry *Entry, keys []string) {
@@ -85,7 +85,7 @@ func printColored(b *bytes.Buffer, entry *Entry, keys []string) {
levelText := strings.ToUpper(entry.Level.String())[0:4]
fmt.Fprintf(b, "\x1b[%dm%s\x1b[0m[%04d] %-44s ", levelColor, levelText, miniTS(), entry.Message)
fmt.Fprintf(b, " \x1b[%dm%s\x1b[0m[%04d] %-44s", levelColor, levelText, miniTS(), entry.Message)
for _, k := range keys {
v := entry.Data[k]
fmt.Fprintf(b, " \x1b[%dm%s\x1b[0m=%v", levelColor, k, v)
@@ -111,12 +111,12 @@ func printKeyValue(b *bytes.Buffer, key, value interface{}) {
case error:
value = value.(error).Error()
default:
fmt.Fprintf(b, "%v=%v ", key, value)
fmt.Fprintf(b, " %v=%v", key, value)
}
if needsQuoting(value.(string)) {
fmt.Fprintf(b, "%v=%s ", key, value)
fmt.Fprintf(b, " %v=%s", key, value)
} else {
fmt.Fprintf(b, "%v=%q ", key, value)
fmt.Fprintf(b, " %v=%q", key, value)
}
}