Merge pull request #76 from AthennaIO/develop

chore(formatter): beautify request formatter
AthennaIO · Sep 22, 2023 · e97a348 · e97a348
2 parents 71f4f3b + 4be2246
commit e97a348
Show file tree

Hide file tree

Showing 4 changed files with 75 additions and 80 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@athenna/logger",
-  "version": "4.4.0",
+  "version": "4.5.0",
   "description": "The Athenna logging solution. Log in stdout, files and buckets.",
   "license": "MIT",
   "author": "João Lenon <lenon@athenna.io>",
@@ -59,7 +59,7 @@
     "cls-rtracer": "^2.6.3"
   },
   "devDependencies": {
-    "@athenna/common": "^4.10.1",
+    "@athenna/common": "^4.13.1",
     "@athenna/config": "^4.4.0",
     "@athenna/ioc": "^4.3.0",
     "@athenna/test": "^4.7.0",

diff --git a/src/formatters/RequestFormatter.ts b/src/formatters/RequestFormatter.ts
@@ -16,26 +16,22 @@ export class RequestFormatter extends Formatter {
       return ctx
     }
 
-    const ip = ctx.request.ip
-    const status = ctx.status
     const responseTimeMs = `${Math.round(ctx.responseTime)}ms`
-    const methodAndStatus = Color[ctx.request.method](
-      `[${ctx.request.method}::${ctx.status}]`
-    )
+    const status = Color.statusCode(ctx.status)
+    const method = Color.httpMethod(ctx.request.method)
+    const date = new Date().toISOString()
 
     if (!this.configs.asJson) {
       return this.clean(
-        `${methodAndStatus} - [${ip}] - ${new Date().toISOString()} - ${
-          ctx.request.baseUrl
-        } ${responseTimeMs}`
+        `${method}${status} ${ctx.request.baseUrl} - ${date} - ${responseTimeMs}`
       )
     }
 
     const metadata = {
       method: ctx.request.method,
       duration: responseTimeMs,
-      status: status <= 399 ? 'SUCCESS' : 'ERROR',
-      statusCode: status,
+      status: ctx.status <= 399 ? 'SUCCESS' : 'ERROR',
+      statusCode: ctx.status,
       url: ctx.request.hostUrl,
       path: ctx.request.baseUrl,
       createdAt: Date.now(),

diff --git a/tests/unit/formatters/RequestFormatterTest.ts b/tests/unit/formatters/RequestFormatterTest.ts
@@ -41,8 +41,7 @@ export default class RequestFormatterTest {
 
     const message = formatter.format(ctx)
 
-    assert.isTrue(message.includes('127.0.0.1'))
-    assert.isTrue(message.includes('[GET::200]'))
+    assert.isTrue(message.includes('GET'))
     assert.isTrue(message.includes('http://localhost:1335/:id'))
     assert.isTrue(message.includes('ms'))
   }