From a54142987c913f47de4dcec9d9b2dc4bb3654f22 Mon Sep 17 00:00:00 2001
From: Nikifor Seryakov <nikandfor@gmail.com>
Date: Mon, 20 May 2019 17:26:29 +0400
Subject: [PATCH] log: do not pad values longer than 40 characters (#19592)

* log: Do not pad too long values

* log: gofmt
---
 log/format.go | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/log/format.go b/log/format.go
index 7902b296e6..a1b5dac629 100644
--- a/log/format.go
+++ b/log/format.go
@@ -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.
@@ -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()
@@ -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))
 		}
 	}