From e25594540c5b73b58b145e32ddd597b370dd6f7e Mon Sep 17 00:00:00 2001
From: tsmethurst <tobi.smethurst@klarrio.com>
Date: Fri, 27 Aug 2021 12:09:24 +0200
Subject: [PATCH] log user agent

---
 internal/router/logger.go | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/internal/router/logger.go b/internal/router/logger.go
index 3c2033726..0daafba22 100644
--- a/internal/router/logger.go
+++ b/internal/router/logger.go
@@ -41,8 +41,9 @@ func loggerWithConfig(log *logrus.Logger) gin.HandlerFunc {
 
 		// Log only when path is not being skipped
 		if _, ok := skipPaths[path]; !ok {
-			latency := time.Now().Sub(start)
+			latency := time.Since(start)
 			clientIP := c.ClientIP()
+			userAgent := c.Request.UserAgent()
 			method := c.Request.Method
 			statusCode := c.Writer.Status()
 			errorMessage := c.Errors.ByType(gin.ErrorTypePrivate).String()
@@ -54,17 +55,17 @@ func loggerWithConfig(log *logrus.Logger) gin.HandlerFunc {
 			l := log.WithFields(logrus.Fields{
 				"latency":    latency,
 				"clientIP":   clientIP,
+				"userAgent":  userAgent,
 				"method":     method,
 				"statusCode": statusCode,
 				"path":       path,
 			})
 
-			if errorMessage != "" {
-				l.Error(errorMessage)
-				return
+			if errorMessage == "" {
+				l.Infof("%s: wrote %d bytes in %v", http.StatusText(statusCode), bodySize, latency)
+			} else {
+				l.Errorf("%s: %s", http.StatusText(statusCode), errorMessage)
 			}
-
-			l.Infof("%s: wrote %d bytes in %v", http.StatusText(statusCode), bodySize, latency)
 		}
 	}