diff --git a/packages/api-server/src/__tests__/logFormatter.test.ts b/packages/api-server/src/__tests__/logFormatter.test.ts index e2d32edb1050..3f2ade63763c 100644 --- a/packages/api-server/src/__tests__/logFormatter.test.ts +++ b/packages/api-server/src/__tests__/logFormatter.test.ts @@ -232,6 +232,14 @@ describe('LogFormatter', () => { }) ).toMatch('"environment": "staging"') + logFormatter({ + level: 10, + deploy: { + environment: 'staging', + version: '4.2.1', + }, + }) // ? + expect( logFormatter({ level: 10, @@ -243,4 +251,12 @@ describe('LogFormatter', () => { ).toMatch('"version": "4.2.1"') }) }) + + it('Should not have any undefined ns, name, or message', () => { + expect( + logFormatter({ + level: 10, + }) + ).not.toContain('undefined') + }) }) diff --git a/packages/api-server/src/logFormatter/formatters.ts b/packages/api-server/src/logFormatter/formatters.ts index dc5e99cd1c7d..2d7ec1244e99 100644 --- a/packages/api-server/src/logFormatter/formatters.ts +++ b/packages/api-server/src/logFormatter/formatters.ts @@ -121,7 +121,7 @@ export const formatMessage = (logData: any) => { } export const formatMethod = (method: string) => { - return chalk.white(method) + return method && chalk.white(method) } export const formatRequestId = (requestId: string) => { @@ -129,14 +129,18 @@ export const formatRequestId = (requestId: string) => { } export const formatNs = (ns: string) => { - return chalk.cyan(ns) + return ns && chalk.cyan(ns) } export const formatName = (name: string) => { - return chalk.blue(name) + return name && chalk.blue(name) } export const formatMessageName = (message: string) => { + if (message === undefined) { + return '' + } + if (message === 'request') { return '<--' }