From ce20f107f5dc498ec7489d7739541a25dcd48463 Mon Sep 17 00:00:00 2001
From: Dan Markham <dmarkham@gmail.com>
Date: Wed, 27 Mar 2019 23:14:00 -0700
Subject: [PATCH] Truncate Latency precision in long running request (#1830)

fixes #1823
---
 logger.go      |  4 ++++
 logger_test.go | 24 ++++++++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/logger.go b/logger.go
index 198a0192d6..5ab4639efe 100644
--- a/logger.go
+++ b/logger.go
@@ -136,6 +136,10 @@ var defaultLogFormatter = func(param LogFormatterParams) string {
 		resetColor = param.ResetColor()
 	}
 
+	if param.Latency > time.Minute {
+		// Truncate in a golang < 1.8 safe way
+		param.Latency = param.Latency - param.Latency%time.Second
+	}
 	return fmt.Sprintf("[GIN] %v |%s %3d %s| %13v | %15s |%s %-7s %s %s\n%s",
 		param.TimeStamp.Format("2006/01/02 - 15:04:05"),
 		statusColor, param.StatusCode, resetColor,
diff --git a/logger_test.go b/logger_test.go
index 11a859e6a4..56bb3a00e3 100644
--- a/logger_test.go
+++ b/logger_test.go
@@ -253,10 +253,34 @@ func TestDefaultLogFormatter(t *testing.T) {
 		ErrorMessage: "",
 		isTerm:       true,
 	}
+	termTrueLongDurationParam := LogFormatterParams{
+		TimeStamp:    timeStamp,
+		StatusCode:   200,
+		Latency:      time.Millisecond * 9876543210,
+		ClientIP:     "20.20.20.20",
+		Method:       "GET",
+		Path:         "/",
+		ErrorMessage: "",
+		isTerm:       true,
+	}
+
+	termFalseLongDurationParam := LogFormatterParams{
+		TimeStamp:    timeStamp,
+		StatusCode:   200,
+		Latency:      time.Millisecond * 9876543210,
+		ClientIP:     "20.20.20.20",
+		Method:       "GET",
+		Path:         "/",
+		ErrorMessage: "",
+		isTerm:       false,
+	}
 
 	assert.Equal(t, "[GIN] 2018/12/07 - 09:11:42 | 200 |            5s |     20.20.20.20 | GET      /\n", defaultLogFormatter(termFalseParam))
+	assert.Equal(t, "[GIN] 2018/12/07 - 09:11:42 | 200 |    2743h29m3s |     20.20.20.20 | GET      /\n", defaultLogFormatter(termFalseLongDurationParam))
 
 	assert.Equal(t, "[GIN] 2018/12/07 - 09:11:42 |\x1b[97;42m 200 \x1b[0m|            5s |     20.20.20.20 |\x1b[97;44m GET     \x1b[0m /\n", defaultLogFormatter(termTrueParam))
+	assert.Equal(t, "[GIN] 2018/12/07 - 09:11:42 |\x1b[97;42m 200 \x1b[0m|    2743h29m3s |     20.20.20.20 |\x1b[97;44m GET     \x1b[0m /\n", defaultLogFormatter(termTrueLongDurationParam))
+
 }
 
 func TestColorForMethod(t *testing.T) {