From 4f3dbd21026e1d9e5ac1f0960ef955831f079e09 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Mon, 10 Feb 2025 14:50:46 -0500 Subject: [PATCH] Remove enablement --- src/logger/__tests__/logger.test.ts | 46 ++--------------------------- src/logger/index.ts | 14 --------- 2 files changed, 3 insertions(+), 57 deletions(-) diff --git a/src/logger/__tests__/logger.test.ts b/src/logger/__tests__/logger.test.ts index be2391e126..e6baf96e18 100644 --- a/src/logger/__tests__/logger.test.ts +++ b/src/logger/__tests__/logger.test.ts @@ -26,49 +26,16 @@ beforeAll(() => { describe('general functionality', () => { test('default params', () => { const logger = new Logger() - expect(logger.enabled).toBeFalsy() expect(logger.level).toEqual(LogLevel.Debug) // mocked above }) test('can override default params', () => { const logger = new Logger({ - enabled: true, level: LogLevel.Info, }) - expect(logger.enabled).toBeTruthy() expect(logger.level).toEqual(LogLevel.Info) }) - test('disabled logger does not report', () => { - const logger = new Logger({ - enabled: false, - level: LogLevel.Debug, - }) - - const mockTransport = jest.fn() - - logger.addTransport(mockTransport) - logger.debug('message') - - expect(mockTransport).not.toHaveBeenCalled() - }) - - test('disablement', () => { - const logger = new Logger({ - enabled: true, - level: LogLevel.Debug, - }) - - logger.disable() - - const mockTransport = jest.fn() - - logger.addTransport(mockTransport) - logger.debug('message') - - expect(mockTransport).not.toHaveBeenCalled() - }) - test('passing debug contexts automatically enables debug mode', () => { const logger = new Logger({debug: 'specific'}) expect(logger.level).toEqual(LogLevel.Debug) @@ -76,7 +43,7 @@ describe('general functionality', () => { test('supports extra metadata', () => { const timestamp = Date.now() - const logger = new Logger({enabled: true}) + const logger = new Logger({}) const mockTransport = jest.fn() @@ -95,7 +62,7 @@ describe('general functionality', () => { test('supports nullish/falsy metadata', () => { const timestamp = Date.now() - const logger = new Logger({enabled: true}) + const logger = new Logger({}) const mockTransport = jest.fn() @@ -241,7 +208,7 @@ describe('general functionality', () => { test('add/remove transport', () => { const timestamp = Date.now() - const logger = new Logger({enabled: true}) + const logger = new Logger({}) const mockTransport = jest.fn() const remove = logger.addTransport(mockTransport) @@ -270,7 +237,6 @@ describe('debug contexts', () => { const timestamp = Date.now() const message = nanoid() const logger = new Logger({ - enabled: true, debug: 'specific', }) @@ -289,7 +255,6 @@ describe('debug contexts', () => { const timestamp = Date.now() const message = nanoid() const logger = new Logger({ - enabled: true, debug: 'namespace*', }) @@ -308,7 +273,6 @@ describe('debug contexts', () => { const timestamp = Date.now() const message = nanoid() const logger = new Logger({ - enabled: true, debug: 'namespace:foo:*', }) @@ -328,7 +292,6 @@ describe('supports levels', () => { test('debug', () => { const timestamp = Date.now() const logger = new Logger({ - enabled: true, level: LogLevel.Debug, }) const message = nanoid() @@ -368,7 +331,6 @@ describe('supports levels', () => { test('info', () => { const timestamp = Date.now() const logger = new Logger({ - enabled: true, level: LogLevel.Info, }) const message = nanoid() @@ -391,7 +353,6 @@ describe('supports levels', () => { test('warn', () => { const timestamp = Date.now() const logger = new Logger({ - enabled: true, level: LogLevel.Warn, }) const message = nanoid() @@ -417,7 +378,6 @@ describe('supports levels', () => { test('error', () => { const timestamp = Date.now() const logger = new Logger({ - enabled: true, level: LogLevel.Error, }) const message = nanoid() diff --git a/src/logger/index.ts b/src/logger/index.ts index 102bccef7a..22cf38f0c6 100644 --- a/src/logger/index.ts +++ b/src/logger/index.ts @@ -166,22 +166,18 @@ export class Logger { LogLevel = LogLevel DebugContext = DebugContext - enabled: boolean level: LogLevel transports: Transport[] = [] protected debugContextRegexes: RegExp[] = [] constructor({ - enabled = process.env.NODE_ENV !== 'test', level = env.LOG_LEVEL as LogLevel, debug = env.LOG_DEBUG || '', }: { - enabled?: boolean level?: LogLevel debug?: string } = {}) { - this.enabled = enabled !== false this.level = debug ? LogLevel.Debug : level ?? LogLevel.Info // default to info this.debugContextRegexes = (debug || '').split(',').map(context => { return new RegExp(context.replace(/[^\w:*]/, '').replace(/\*/g, '.*')) @@ -217,21 +213,11 @@ export class Logger { } } - disable() { - this.enabled = false - } - - enable() { - this.enabled = true - } - protected transport( level: LogLevel, message: string | Error, metadata: Metadata = {}, ) { - if (!this.enabled) return - const timestamp = Date.now() const meta = metadata || {}