From da9d9e66f066813aca3a0c2e5fe59192f57ceb3b Mon Sep 17 00:00:00 2001 From: hatim boufnichel Date: Tue, 7 May 2024 15:56:00 +0200 Subject: [PATCH] log component name --- src/services/helpers/logger.ts | 16 ++++++++++++++-- src/tests/spamExternalPayments.spec.ts | 2 +- src/tests/spamMixedPayments.spec.ts | 2 +- src/tests/testBase.ts | 2 ++ 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/services/helpers/logger.ts b/src/services/helpers/logger.ts index 591ff0e5a..c7a425847 100644 --- a/src/services/helpers/logger.ts +++ b/src/services/helpers/logger.ts @@ -78,6 +78,12 @@ export const getLogger = (params: LoggerParams): PubLogger => { } toLog.push(params.appName) } + if (params.component) { + if (disabledComponents.includes(params.component)) { + return + } + toLog.push(params.component) + } if (params.userId) { toLog.push(params.userId) } @@ -87,7 +93,13 @@ export const getLogger = (params: LoggerParams): PubLogger => { writers.forEach(w => w(final)) } } -const disabledApps: string[] = [] -export const disableLoggers = (appNamesToDisable: string[]) => { +let disabledApps: string[] = [] +let disabledComponents: string[] = [] +export const resetDisabledLoggers = () => { + disabledApps = [] + disabledComponents = [] +} +export const disableLoggers = (appNamesToDisable: string[], componentsToDisable: string[]) => { disabledApps.push(...appNamesToDisable) + disabledComponents.push(...componentsToDisable) } \ No newline at end of file diff --git a/src/tests/spamExternalPayments.spec.ts b/src/tests/spamExternalPayments.spec.ts index a7e935c90..6e0804694 100644 --- a/src/tests/spamExternalPayments.spec.ts +++ b/src/tests/spamExternalPayments.spec.ts @@ -4,7 +4,7 @@ import { Describe, expect, expectThrowsAsync, runSanityCheck, safelySetUserBalan export const ignore = false export default async (T: TestBase) => { - disableLoggers(["EventsLogManager", "htlcTracker", "watchdog"]) + disableLoggers([], ["EventsLogManager", "htlcTracker", "watchdog"]) await safelySetUserBalance(T, T.user1, 2000) await testSpamExternalPayment(T) await runSanityCheck(T) diff --git a/src/tests/spamMixedPayments.spec.ts b/src/tests/spamMixedPayments.spec.ts index b271369f0..0abf45943 100644 --- a/src/tests/spamMixedPayments.spec.ts +++ b/src/tests/spamMixedPayments.spec.ts @@ -5,7 +5,7 @@ import * as Types from '../../proto/autogenerated/ts/types.js' export const ignore = false export default async (T: TestBase) => { - disableLoggers(["EventsLogManager", "htlcTracker", "watchdog"]) + disableLoggers([], ["EventsLogManager", "htlcTracker", "watchdog"]) await safelySetUserBalance(T, T.user1, 2000) await testSpamExternalPayment(T) await runSanityCheck(T) diff --git a/src/tests/testBase.ts b/src/tests/testBase.ts index 236de4c72..246aceb67 100644 --- a/src/tests/testBase.ts +++ b/src/tests/testBase.ts @@ -9,6 +9,7 @@ import chaiString from 'chai-string' import { defaultInvoiceExpiry } from '../services/storage/paymentStorage.js' import SanityChecker from '../services/main/sanityChecker.js' import LND from '../services/lnd/lnd.js' +import { resetDisabledLoggers } from '../services/helpers/logger.js' chai.use(chaiString) export const expect = chai.expect export type Describe = (message: string, failure?: boolean) => void @@ -69,6 +70,7 @@ export const teardown = async (T: TestBase) => { T.externalAccessToMainLnd.Stop() T.externalAccessToOtherLnd.Stop() T.externalAccessToThirdLnd.Stop() + resetDisabledLoggers() console.log("teardown") }