From fcdd3730aa12b6c96b4da1453ca0a04e8f26a0e1 Mon Sep 17 00:00:00 2001
From: Henrik Nygren <nygrenh@gmail.com>
Date: Wed, 15 May 2024 07:54:51 +0300
Subject: [PATCH] Log format changes (#1260)

Change log format
---
 frontend/middleware.ts | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/frontend/middleware.ts b/frontend/middleware.ts
index 411888715..b537c1d3e 100644
--- a/frontend/middleware.ts
+++ b/frontend/middleware.ts
@@ -61,21 +61,19 @@ const getIp = (req: NextRequest) => {
 }
 
 const loggerMiddleware = async (req: NextRequest, res: NextResponse) => {
-  const remoteAddress = req.ip || getIp(req) || "-"
-  const remoteUser = "-"
+  const remoteAddress = getIp(req) ?? req.ip ?? "-"
+  const remoteUser = "user"
   const date = new Date().toISOString()
   const method = req.method
   const url = req.url
-  const referrer = req.headers.get("referer") || "-"
-  const userAgent = req.headers.get("user-agent") || "-"
+  const referrer = req.headers.get("referer") ?? "-"
+  const userAgent = req.headers.get("user-agent") ?? "-"
 
   const status = res.status
   const httpVersion = "HTTP/1.1"
-  const resContentLength = res.headers.get("content-length") || "-"
+  const resContentLength = res.headers.get("content-length") ?? 1
 
-  // const color = styles[responseStatusToColor(status)]
-  // const log = `${remoteAddress} ${remoteUser} [${date}] "${color.open}${method} ${url} ${httpVersion}${color.close}" ${status} ${resContentLength} "${referrer}" "${userAgent}"`
-  const message = `${remoteAddress} ${remoteUser} [${date}] "${method} ${url} ${httpVersion}" ${status} ${resContentLength} "${referrer}" "${userAgent}"`
+  const message = `${remoteAddress} - ${remoteUser} [${date}] "${method} ${url} ${httpVersion}" ${status} ${resContentLength} "${referrer}" "${userAgent}"`
   const logFunction = status >= 400 ? console.error : console.log
   logFunction(message)