From 083099a9575f8b2fac22c1d4a51a9dd0e2201243 Mon Sep 17 00:00:00 2001 From: "R. Aidan Campbell" Date: Mon, 11 Oct 2021 05:37:33 -0700 Subject: reference global logrus (#274) * reference logrus' global logger instead of passing and storing a logger reference everywhere * always directly use global logrus logger instead of referencing an instance * test suites should also directly use the global logrus logger * rename gin logging function to clarify that it's middleware * correct comments which erroneously referenced removed logger parameter * setting log level for tests now uses logrus' exported type instead of the string value, to guarantee error isn't possible --- internal/router/logger.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'internal/router/logger.go') diff --git a/internal/router/logger.go b/internal/router/logger.go index 154f5c684..e45ccd127 100644 --- a/internal/router/logger.go +++ b/internal/router/logger.go @@ -30,7 +30,7 @@ var skipPaths = map[string]interface{}{ "/api/v1/streaming": nil, } -func loggerWithConfig(log *logrus.Logger) gin.HandlerFunc { +func loggingMiddleware() gin.HandlerFunc { logHandler := func(c *gin.Context) { start := time.Now() path := c.Request.URL.Path @@ -52,7 +52,7 @@ func loggerWithConfig(log *logrus.Logger) gin.HandlerFunc { path = path + "?" + raw } - l := log.WithFields(logrus.Fields{ + l := logrus.WithFields(logrus.Fields{ "latency": latency, "clientIP": clientIP, "userAgent": userAgent, -- cgit v1.2.3