From 27c7a09ef45155402f8a89555878e386608d5e32 Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Wed, 29 Dec 2021 13:40:59 +0100 Subject: Revert "refactor: Switch back to consola for prettyness" This reverts commit 5c38af061348ec604337280009775832edc66270. --- packages/main/src/utils/logging.ts | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) (limited to 'packages/main/src/utils') diff --git a/packages/main/src/utils/logging.ts b/packages/main/src/utils/logging.ts index 66f9068..9f1133f 100644 --- a/packages/main/src/utils/logging.ts +++ b/packages/main/src/utils/logging.ts @@ -18,16 +18,32 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import consola, { BasicReporter, Consola } from 'consola'; +import loglevel, { Logger } from 'loglevel'; +import prefix from 'loglevel-plugin-prefix'; const isDevelopment = import.meta.env.MODE === 'development'; if (isDevelopment) { - // No fancy console in dev mode. - consola.setReporters([new BasicReporter()]); - consola.level = 4; + loglevel.enableAll(); } -export function getLogger(loggerName: string): Consola { - return consola.withTag(`sophie:${loggerName}`); +prefix.reg(loglevel); +prefix.apply(loglevel, { + format(level, name, timestamp) { + let shortName = 'global'; + if (name !== undefined) { + const nameSegments = name.split(':'); + const lastSegment = nameSegments.pop(); + shortName = [...nameSegments.map((segment) => segment[0]), lastSegment].join(':'); + } + if (isDevelopment) { + // `watch.js` already appends timestamps. + return `${level} (${shortName})`; + } + return `[${timestamp}] ${level} (${shortName})`; + }, +}); + +export function getLogger(loggerName: string): Logger { + return loglevel.getLogger(`sophie:${loggerName}`); } -- cgit v1.2.3-70-g09d2