From 3122a4e8068f71e64dcc46fc6c52957be3927f06 Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Mon, 10 Jan 2022 00:05:01 +0100 Subject: build: Add eslint-plugin-security MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This would run as part of gitlab SAST (if it didn't time out). Signed-off-by: Kristóf Marussy --- packages/main/src/utils/log.ts | 26 +++++++++++--------------- packages/renderer/src/utils/log.ts | 4 ++-- packages/service-preload/src/utils/log.ts | 4 ++-- 3 files changed, 15 insertions(+), 19 deletions(-) (limited to 'packages') diff --git a/packages/main/src/utils/log.ts b/packages/main/src/utils/log.ts index 0a632d8..d9748f4 100644 --- a/packages/main/src/utils/log.ts +++ b/packages/main/src/utils/log.ts @@ -29,23 +29,19 @@ if (import.meta.env?.DEV) { loglevel.setLevel('info'); } -const COLORS: Partial> = { - TRACE: chalk.magenta, - DEBUG: chalk.cyan, - INFO: chalk.blue, - WARN: chalk.yellow, - ERROR: chalk.red, - CRITICAL: chalk.red, -}; - -function getColor(level: string): ChalkInstance { - return COLORS[level] ?? chalk.gray; -} +const COLORS: Map = new Map([ + ['TRACE', chalk.magenta], + ['DEBUG', chalk.cyan], + ['INFO', chalk.blue], + ['WARN', chalk.yellow], + ['ERROR', chalk.red], + ['CRITICAL', chalk.red], +]); prefix.reg(loglevel); prefix.apply(loglevel, { format(level, name, timestamp) { - const levelColor = getColor(level); + const levelColor = COLORS.get(level) ?? chalk.gray; const timeStr = timestamp.toString(); const nameStr = typeof name === 'undefined' @@ -62,7 +58,7 @@ export function getLogger(loggerName: string): loglevel.Logger { export function silenceLogger(): void { loglevel.disableAll(); const loggers = loglevel.getLoggers(); - Object.keys(loggers).forEach((loggerName) => { - loggers[loggerName].disableAll(); + Object.values(loggers).forEach((logger) => { + logger.disableAll(); }); } diff --git a/packages/renderer/src/utils/log.ts b/packages/renderer/src/utils/log.ts index c17fc2a..11664b4 100644 --- a/packages/renderer/src/utils/log.ts +++ b/packages/renderer/src/utils/log.ts @@ -44,7 +44,7 @@ export function getLogger(loggerName: string): Logger { export function silenceLogger(): void { loglevel.disableAll(); const loggers = loglevel.getLoggers(); - Object.keys(loggers).forEach((loggerName) => { - loggers[loggerName].disableAll(); + Object.values(loggers).forEach((logger) => { + logger.disableAll(); }); } diff --git a/packages/service-preload/src/utils/log.ts b/packages/service-preload/src/utils/log.ts index 0c35319..f0bcd59 100644 --- a/packages/service-preload/src/utils/log.ts +++ b/packages/service-preload/src/utils/log.ts @@ -43,7 +43,7 @@ export function getLogger(loggerName: string): Logger { export function silenceLogger(): void { loglevel.disableAll(); const loggers = loglevel.getLoggers(); - Object.keys(loggers).forEach((loggerName) => { - loggers[loggerName].disableAll(); + Object.values(loggers).forEach((logger) => { + logger.disableAll(); }); } -- cgit v1.2.3-54-g00ecf