feat(Logs): Refactor logs to show just one log per request/response pair

Author: dfradehubs

README.md

@@ -55,7 +55,6 @@ logs:
     - REQUEST_HEADER:x-real-ip
 
     - RESPONSE:status
-    - RESPONSE:proto
 
     - RESPONSE_HEADER:content-length
 ```
@@ -90,7 +89,6 @@ The project includes extensive logging capabilities. The logs can be configured
 * REQUEST_HEADER:x-forwarded-for: X-Forwarded-For header of the request.
 * REQUEST_HEADER:x-real-ip: X-Real-IP header of the request.
 * RESPONSE:status: HTTP status of the response.
-* RESPONSE:proto: Protocol of the response.
 * RESPONSE_HEADER:content-length: Content-Length header of the response.
 
 > Note:

config/samples/config.yaml

@@ -21,6 +21,5 @@ logs:
     - REQUEST_HEADER:x-real-ip
 
     - RESPONSE:status
-    - RESPONSE:proto
 
     - RESPONSE_HEADER:content-length

internal/api/api.go

@@ -21,10 +21,8 @@ var (
 func PurgeHandler(ctx v1alpha1.Context) func(c *fiber.Ctx) error {
 	return func(c *fiber.Ctx) error {
 
-		if ctx.Config.Logs.ShowAccessLogs {
-			logFields := GetRequestLogFields(c.Request(), ctx.Config.Logs.AccessLogsFields)
-			ctx.Logger.Infow("request", logFields...)
-		}
+		// Log the request when the function ends
+		defer LogRequest(c, ctx)
 
 		// Parse the JSON body from the request and validate the body
 		if err := c.BodyParser(&req); err != nil {
@@ -94,10 +92,6 @@ func PurgeHandler(ctx v1alpha1.Context) func(c *fiber.Ctx) error {
 			})
 		}
 
-		if ctx.Config.Logs.ShowAccessLogs {
-			logFields := GetResponseLogFields(c.Response(), ctx.Config.Logs.AccessLogsFields)
-			ctx.Logger.Infow("response", logFields...)
-		}
 		defer resp.Body.Close()
 
 		// Decode the Akamai response

internal/api/commons.go

@@ -1,6 +1,8 @@
 package api
 
 import (
+	"akapurgo/api/v1alpha1"
+	"github.com/gofiber/fiber/v2"
 	"github.com/valyala/fasthttp"
 	"regexp"
 	"strconv"
@@ -158,3 +160,13 @@ func GetResponseLogFields(resp *fasthttp.Response, configurationFields []string)
 
 	return logFields
 }
+
+// LogRequest
+func LogRequest(c *fiber.Ctx, ctx v1alpha1.Context) {
+	if ctx.Config.Logs.ShowAccessLogs {
+		logFieldsReq := GetResponseLogFields(c.Response(), ctx.Config.Logs.AccessLogsFields)
+		logFieldsResp := GetRequestLogFields(c.Request(), ctx.Config.Logs.AccessLogsFields)
+		logFields := append(logFieldsReq, logFieldsResp...)
+		ctx.Logger.Infow("request", logFields...)
+	}
+}