Skip to content

log: Do not pad too long values #19592

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
karalabe merged 3 commits into from
May 20, 2019
Merged

log: Do not pad too long values #19592

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a114d4d
log: Do not pad too long values
nikandfor May 17, 2019
04ebb5e
log: gofmt
nikandfor May 18, 2019
73b3182
Merge remote-tracking branch 'origin/master' into patch-1
nikandfor May 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions log/format.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@ import (
)

const (
timeFormat = "2006-01-02T15:04:05-0700"
termTimeFormat = "01-02|15:04:05.000"
floatFormat = 'f'
termMsgJust = 40
timeFormat = "2006-01-02T15:04:05-0700"
termTimeFormat = "01-02|15:04:05.000"
floatFormat = 'f'
termMsgJust = 40
termCtxMaxPadding = 40
)

// locationTrims are trimmed for display to avoid unwieldy log lines.
Expand Down Expand Up @@ -175,7 +176,7 @@ func logfmt(buf *bytes.Buffer, ctx []interface{}, color int, term bool) {
fieldPaddingLock.RUnlock()

length := utf8.RuneCountInString(v)
if padding < length {
if padding < length && length <= termCtxMaxPadding {
padding = length

fieldPaddingLock.Lock()
Expand All @@ -189,7 +190,7 @@ func logfmt(buf *bytes.Buffer, ctx []interface{}, color int, term bool) {
buf.WriteByte('=')
}
buf.WriteString(v)
if i < len(ctx)-2 {
if i < len(ctx)-2 && padding > length {
buf.Write(bytes.Repeat([]byte{' '}, padding-length))
}
}
Expand Down