From f118de2038a8ea13fa6879f87f9dfee947f2d551 Mon Sep 17 00:00:00 2001
From: dragongoose <19649813+dragongoose@users.noreply.github.com>
Date: Tue, 7 Mar 2023 11:20:22 -0500
Subject: [PATCH] Optimise logger

---
 server/util/logger.ts | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/server/util/logger.ts b/server/util/logger.ts
index c4619b0..4b92380 100644
--- a/server/util/logger.ts
+++ b/server/util/logger.ts
@@ -12,14 +12,9 @@ const logLevels = {
   trace: 5,
 };
 
-let currentUUID: string;
-const addReqId = format((info) => {
-  info.reqId = currentUUID
-  return info
-})
 
 export const logger = createLogger({
-    format: format.combine(addReqId(), format.timestamp(), format.json()),
+    format: format.combine(format.timestamp(), format.json()),
     transports: [new transports.Console({}), new transports.File({ filename: './serverLog.log' })],
     levels: logLevels
   });
@@ -29,12 +24,16 @@ export const errorHandler = (err: Error, req: Request, res: Response, next: Next
       return next(err)
     }
 
-    currentUUID = res.locals.uuid
     res.status(500).send({ status: 'error', message: err.message, code: res.locals.uuid })
-    logger.warn(err.message)
+    logger.warn({
+      message: err.message,
+      endpoint: req.originalUrl,
+      reqId: res.locals.uuid,
+      origin: req.headers.origin,
+    })
   }
 
 export const uuid = (req: Request, res: Response, next: NextFunction) => {
   res.locals.uuid = randomUUID()
-  next(res)
+  next()
 }
\ No newline at end of file