diff --git a/src/logging/loggerConfigResolver.spec.ts b/src/logging/loggerConfigResolver.spec.ts index d15d942..6bd81de 100644 --- a/src/logging/loggerConfigResolver.spec.ts +++ b/src/logging/loggerConfigResolver.spec.ts @@ -6,7 +6,7 @@ import { resolveLogger, resolveLoggerConfiguration } from './loggerConfigResolve describe('loggerConfigResolver', () => { describe('resolveLoggerConfiguration', () => { - it('resolves prod configuration', () => { + it('resolves configuration', () => { const loggerConfig = resolveLoggerConfiguration({ logLevel: 'warn', nodeEnv: 'production', @@ -23,34 +23,6 @@ describe('loggerConfigResolver', () => { `) }) - it('resolves dev configuration', () => { - const loggerConfig = resolveLoggerConfiguration({ - logLevel: 'debug', - nodeEnv: 'development', - }) - - expect(loggerConfig).toMatchObject({ - levels: { - labels: { - '10': 'trace', - '20': 'debug', - '30': 'info', - '40': 'warn', - '50': 'error', - '60': 'fatal', - }, - values: { - debug: 20, - error: 50, - fatal: 60, - info: 30, - trace: 10, - warn: 40, - }, - }, - }) - }) - it('does not crash during label resolution', () => { const loggerConfig = resolveLoggerConfiguration({ logLevel: 'warn', diff --git a/src/logging/loggerConfigResolver.ts b/src/logging/loggerConfigResolver.ts index 9c54de3..f566f72 100644 --- a/src/logging/loggerConfigResolver.ts +++ b/src/logging/loggerConfigResolver.ts @@ -20,7 +20,7 @@ export function resolveMonorepoLogger(appConfig: MonorepoAppLoggerConfig): Logge return resolveLogger(appConfig) } - const configuration = resolveMonorepoLoggerConfiguration(appConfig) as LoggerOptions + const configuration = resolveMonorepoLoggerConfiguration(appConfig) return pino(configuration) } @@ -28,11 +28,7 @@ export function resolveMonorepoLogger(appConfig: MonorepoAppLoggerConfig): Logge /* c8 ignore next 25 */ export function resolveMonorepoLoggerConfiguration( appConfig: MonorepoAppLoggerConfig, -): LoggerOptions | Logger { - if (appConfig.nodeEnv !== 'development') { - return resolveLoggerConfiguration(appConfig) - } - +): LoggerOptions { return { level: appConfig.logLevel, formatters: { @@ -49,21 +45,15 @@ export function resolveMonorepoLoggerConfiguration( append: appConfig.append ?? false, }, }, - } + } satisfies LoggerOptions } export function resolveLogger(appConfig: AppLoggerConfig): Logger { - if (appConfig.nodeEnv !== 'production') { - return resolveLoggerConfiguration(appConfig) as Logger - } + const configuration = resolveLoggerConfiguration(appConfig) - const configuration = resolveLoggerConfiguration(appConfig) as LoggerOptions - return pino(configuration) -} - -export function resolveLoggerConfiguration(appConfig: AppLoggerConfig): LoggerOptions | Logger { if (appConfig.nodeEnv !== 'production') { return pino( + configuration, pretty({ sync: true, minimumLevel: appConfig.logLevel as Level, @@ -74,6 +64,10 @@ export function resolveLoggerConfiguration(appConfig: AppLoggerConfig): LoggerOp ) } + return pino(configuration) +} + +export function resolveLoggerConfiguration(appConfig: AppLoggerConfig): LoggerOptions { return { level: appConfig.logLevel, formatters: {