From ea91a0486e69310ec6e331774927530242ebe902 Mon Sep 17 00:00:00 2001
From: Helmut Merz <helmutm@cy55.de>
Date: Sat, 1 Jul 2023 19:33:13 +0200
Subject: [PATCH] server: minor improvements of logger middleware

---
 server/logger.go | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/server/logger.go b/server/logger.go
index b127096..4522fb4 100644
--- a/server/logger.go
+++ b/server/logger.go
@@ -9,30 +9,23 @@ import (
 
 func Logger(ctx lib.Context) gin.HandlerFunc {
 	return func(c *gin.Context) {
-		// before request
 		// t := time.Now()
-		path := c.Request.URL.Path
-		raw := c.Request.URL.RawQuery
-		if raw != "" {
-			path = path + "?" + raw
-		}
 		c.Next()
-		// after request
 		msg := c.Errors.String()
 		if msg == "" {
 			msg = "request"
 		}
-		status := c.Writer.Status()
 		var evt *zerolog.Event
-		switch {
-		case status >= 500:
+		status := c.Writer.Status()
+		if status >= 500 {
 			evt = logging.Error(ctx)
-		case status >= 400:
+		} else if status >= 400 {
 			evt = logging.Warn(ctx)
-		default:
+		} else {
 			evt = logging.Info(ctx)
 		}
-		evt.Str("method", c.Request.Method).Str("path", path).
+		evt.Str("method", c.Request.Method).
+			Str("path", c.Request.URL.Path).
 			//	Dur("resp_time", time.Since(t)).
 			Int("status", status).
 			Str("client_ip", c.ClientIP()).Msg(msg)