a
/
zlog
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove extra space in console when there is no message (#413)

This commit is contained in:
Mitar 2022-02-19 07:39:18 -08:00 committed by GitHub
parent fc26014bd4
commit 361cdf616a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
console.go
View File

@ -145,7 +145,8 @@ func (w ConsoleWriter) writeFields(evt map[string]interface{}, buf *bytes.Buffer
} }
sort.Strings(fields) sort.Strings(fields)
if len(fields) > 0 { // Write space only if something has already been written to the buffer, and if there are fields.
if buf.Len() > 0 && len(fields) > 0 {
buf.WriteByte(' ') buf.WriteByte(' ')
} }
@ -268,10 +269,10 @@ func (w ConsoleWriter) writePart(buf *bytes.Buffer, evt map[string]interface{},
var s = f(evt[p]) var s = f(evt[p])
if len(s) > 0 { if len(s) > 0 {
buf.WriteString(s) if buf.Len() > 0 {
if p != w.PartsOrder[len(w.PartsOrder)-1] { // Skip space for last part buf.WriteByte(' ') // Write space only if not the first part
buf.WriteByte(' ')
} }
buf.WriteString(s)
} }
} }

2
console_test.go
View File

@ -196,7 +196,7 @@ func TestConsoleWriter(t *testing.T) {
t.Errorf("Unexpected error when writing output: %s", err) t.Errorf("Unexpected error when writing output: %s", err)
} }
expectedOutput := "<nil> DBG foo=bar\n" expectedOutput := "<nil> DBG foo=bar\n"
actualOutput := buf.String() actualOutput := buf.String()
if actualOutput != expectedOutput { if actualOutput != expectedOutput {
t.Errorf("Unexpected output %q, want: %q", actualOutput, expectedOutput) t.Errorf("Unexpected output %q, want: %q", actualOutput, expectedOutput)