From 5c38af061348ec604337280009775832edc66270 Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Tue, 28 Dec 2021 20:13:45 +0100 Subject: refactor: Switch back to consola for prettyness --- packages/main/src/controllers/config.ts | 2 +- packages/main/src/utils/logging.ts | 28 ++++++---------------------- 2 files changed, 7 insertions(+), 23 deletions(-) (limited to 'packages/main/src') diff --git a/packages/main/src/controllers/config.ts b/packages/main/src/controllers/config.ts index 7187ab4..564658b 100644 --- a/packages/main/src/controllers/config.ts +++ b/packages/main/src/controllers/config.ts @@ -70,7 +70,7 @@ export async function initConfig( logger.info('Config file was not found'); try { await writeConfig(); - logger.info('Created config file'); + logger.success('Created config file'); } catch (err) { logger.error('Failed to initialize config'); } diff --git a/packages/main/src/utils/logging.ts b/packages/main/src/utils/logging.ts index 9f1133f..66f9068 100644 --- a/packages/main/src/utils/logging.ts +++ b/packages/main/src/utils/logging.ts @@ -18,32 +18,16 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import loglevel, { Logger } from 'loglevel'; -import prefix from 'loglevel-plugin-prefix'; +import consola, { BasicReporter, Consola } from 'consola'; const isDevelopment = import.meta.env.MODE === 'development'; if (isDevelopment) { - loglevel.enableAll(); + // No fancy console in dev mode. + consola.setReporters([new BasicReporter()]); + consola.level = 4; } -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}`); +export function getLogger(loggerName: string): Consola { + return consola.withTag(`sophie:${loggerName}`); } -- cgit v1.2.3-70-g09d2