Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 1 addition & 29 deletions src/logging/loggerConfigResolver.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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',
Expand Down
24 changes: 9 additions & 15 deletions src/logging/loggerConfigResolver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,15 @@ export function resolveMonorepoLogger(appConfig: MonorepoAppLoggerConfig): Logge
return resolveLogger(appConfig)
}

const configuration = resolveMonorepoLoggerConfiguration(appConfig) as LoggerOptions
const configuration = resolveMonorepoLoggerConfiguration(appConfig)
return pino(configuration)
}

// Note that transports do not work in vitest, likely because pino attempts to run them in a separate worker
/* c8 ignore next 25 */
export function resolveMonorepoLoggerConfiguration(
appConfig: MonorepoAppLoggerConfig,
): LoggerOptions | Logger {
if (appConfig.nodeEnv !== 'development') {
return resolveLoggerConfiguration(appConfig)
}

): LoggerOptions {
return {
level: appConfig.logLevel,
formatters: {
Expand All @@ -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,
Expand All @@ -74,6 +64,10 @@ export function resolveLoggerConfiguration(appConfig: AppLoggerConfig): LoggerOp
)
}

return pino(configuration)
}

export function resolveLoggerConfiguration(appConfig: AppLoggerConfig): LoggerOptions {
return {
level: appConfig.logLevel,
formatters: {
Expand Down
Loading