From 08021429eafd7241a8990597f1c8bcad8a424aee Mon Sep 17 00:00:00 2001 From: Karl Skewes Date: Mon, 3 Jun 2019 10:04:15 +1200 Subject: [PATCH] formatting and extra test Can probably slim down the `ExcludePath` tests. --- logging_handler_test.go | 1 + pkg/logger/logger.go | 1 + 2 files changed, 2 insertions(+) diff --git a/logging_handler_test.go b/logging_handler_test.go index b036a1f6..0adec08c 100644 --- a/logging_handler_test.go +++ b/logging_handler_test.go @@ -24,6 +24,7 @@ func TestLoggingHandler_ServeHTTP(t *testing.T) { {logger.DefaultRequestLoggingFormat, fmt.Sprintf("127.0.0.1 - - [%s] test-server GET - \"/foo/bar\" HTTP/1.1 \"\" 200 4 0.000\n", logger.FormatTimestamp(ts)), "/foo/bar", ""}, {logger.DefaultRequestLoggingFormat, fmt.Sprintf("127.0.0.1 - - [%s] test-server GET - \"/foo/bar\" HTTP/1.1 \"\" 200 4 0.000\n", logger.FormatTimestamp(ts)), "/foo/bar", "/ping"}, {logger.DefaultRequestLoggingFormat, fmt.Sprintf("127.0.0.1 - - [%s] test-server GET - \"/ping\" HTTP/1.1 \"\" 200 4 0.000\n", logger.FormatTimestamp(ts)), "/ping", ""}, + {logger.DefaultRequestLoggingFormat, "", "/ping", "/ping"}, {"{{.RequestMethod}}", "GET\n", "/foo/bar", ""}, {"{{.RequestMethod}}", "GET\n", "/foo/bar", "/ping"}, {"{{.RequestMethod}}", "GET\n", "/ping", ""}, diff --git a/pkg/logger/logger.go b/pkg/logger/logger.go index 68149c75..89b8450f 100644 --- a/pkg/logger/logger.go +++ b/pkg/logger/logger.go @@ -182,6 +182,7 @@ func (l *Logger) PrintReq(username, upstream string, req *http.Request, url url. if url.Path == l.excludePath { return } + duration := float64(time.Now().Sub(ts)) / float64(time.Second) if username == "" {