Update implementation

gchq · Oct 25, 2024 · 35a0944 · 35a0944
1 parent d2f4c77
commit 35a0944
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/backend/src/routes/middleware/expressLogger.ts b/backend/src/routes/middleware/expressLogger.ts
@@ -17,7 +17,7 @@ const morganLog = promisify(
         requestId: req.reqId,
         ...(tokens.res(req, res, 'content-length') && { 'content-length': tokens.res(req, res, 'content-length') }),
       }
-      req.log.debug(info)
+      req.log.debug(info, 'Request completed')
 
       return ''
     },

diff --git a/backend/src/services/log.ts b/backend/src/services/log.ts
@@ -16,7 +16,7 @@ interface BunyanLog {
   msg: string
 }
 
-interface RequestLog extends BunyanLog {
+interface RequestCompletedLog extends BunyanLog {
   method: string
   url: string
   status: number
@@ -84,9 +84,9 @@ export class Writer extends WritableStream {
     return typeof value === 'object' ? util.inspect(value) : String(value)
   }
 
-  static isRequest(data: any): data is RequestLog {
+  static isRequestCompleted(data: any): data is RequestCompletedLog {
     const keys = Object.keys(data)
-    return ['requestId', 'url', 'method'].every((k) => keys.includes(k))
+    return ['requestId', 'url', 'method'].every((k) => keys.includes(k)) && data.msg === 'Request completed'
   }
 
   static getAttributes(data: any) {
@@ -105,7 +105,7 @@ export class Writer extends WritableStream {
     ])
     let keys = Object.keys(attributes)
 
-    if (Writer.isRequest(data)) {
+    if (Writer.isRequestCompleted(data)) {
       // this is probably a req object.
       attributes = omit(attributes, ['requestId', 'agent'])
       keys = Object.keys(attributes)
@@ -137,7 +137,7 @@ export class Writer extends WritableStream {
     const formattedAttributes = attributes.length ? `${data.msg ? ' ' : ''}(${attributes})` : ''
 
     let message
-    if (Writer.isRequest(data)) {
+    if (Writer.isRequestCompleted(data)) {
       message = `${level} - ${data.status} ${data.method} ${data.url} ${data['response-time']}ms`
     } else {
       message = `${level} - (${src}): ${data.msg}${formattedAttributes}`