Replace reqId with req.id (if it is available)

AugustArchive · Mar 12, 2023 · 2dcb670 · 2dcb670
1 parent cb4541f
commit 2dcb670
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/formatters/json.ts b/src/formatters/json.ts
@@ -24,7 +24,7 @@
 import { BaseFormatter, type LogRecord } from './base';
 import { levelLabelNames, omit } from '../utils';
 import { EOL, userInfo } from 'os';
-import { Lazy } from '@noelware/utils';
+import { hasOwnProperty, Lazy } from '@noelware/utils';
 
 const username = new Lazy(() => {
     const info = userInfo();
@@ -42,6 +42,11 @@ export class JsonFormatter extends BaseFormatter {
         };
 
         const rest = omit(record, ['hostname', 'level', 'msg', 'time', 'name']);
+        if (hasOwnProperty(rest, 'reqId') && hasOwnProperty(rest, 'req') && rest.req.id === null) {
+            rest.req.id = rest.reqId;
+            delete rest.reqId;
+        }
+
         return (
             JSON.stringify({
                 ...payload,