diff options
author | Kristóf Marussy <kristof@marussy.com> | 2021-12-29 13:40:59 +0100 |
---|---|---|
committer | Kristóf Marussy <kristof@marussy.com> | 2021-12-29 13:40:59 +0100 |
commit | 27c7a09ef45155402f8a89555878e386608d5e32 (patch) | |
tree | 84f9f9c1d6d753d7ce15c2b7e441b6bb06869c3a /packages/main/src | |
parent | refactor: Switch back to consola for prettyness (diff) | |
download | sophie-27c7a09ef45155402f8a89555878e386608d5e32.tar.gz sophie-27c7a09ef45155402f8a89555878e386608d5e32.tar.zst sophie-27c7a09ef45155402f8a89555878e386608d5e32.zip |
Revert "refactor: Switch back to consola for prettyness"
This reverts commit 5c38af061348ec604337280009775832edc66270.
Diffstat (limited to 'packages/main/src')
-rw-r--r-- | packages/main/src/controllers/config.ts | 2 | ||||
-rw-r--r-- | packages/main/src/utils/logging.ts | 28 |
2 files changed, 23 insertions, 7 deletions
diff --git a/packages/main/src/controllers/config.ts b/packages/main/src/controllers/config.ts index 564658b..7187ab4 100644 --- a/packages/main/src/controllers/config.ts +++ b/packages/main/src/controllers/config.ts | |||
@@ -70,7 +70,7 @@ export async function initConfig( | |||
70 | logger.info('Config file was not found'); | 70 | logger.info('Config file was not found'); |
71 | try { | 71 | try { |
72 | await writeConfig(); | 72 | await writeConfig(); |
73 | logger.success('Created config file'); | 73 | logger.info('Created config file'); |
74 | } catch (err) { | 74 | } catch (err) { |
75 | logger.error('Failed to initialize config'); | 75 | logger.error('Failed to initialize config'); |
76 | } | 76 | } |
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 @@ | |||
18 | * SPDX-License-Identifier: AGPL-3.0-only | 18 | * SPDX-License-Identifier: AGPL-3.0-only |
19 | */ | 19 | */ |
20 | 20 | ||
21 | import consola, { BasicReporter, Consola } from 'consola'; | 21 | import loglevel, { Logger } from 'loglevel'; |
22 | import prefix from 'loglevel-plugin-prefix'; | ||
22 | 23 | ||
23 | const isDevelopment = import.meta.env.MODE === 'development'; | 24 | const isDevelopment = import.meta.env.MODE === 'development'; |
24 | 25 | ||
25 | if (isDevelopment) { | 26 | if (isDevelopment) { |
26 | // No fancy console in dev mode. | 27 | loglevel.enableAll(); |
27 | consola.setReporters([new BasicReporter()]); | ||
28 | consola.level = 4; | ||
29 | } | 28 | } |
30 | 29 | ||
31 | export function getLogger(loggerName: string): Consola { | 30 | prefix.reg(loglevel); |
32 | return consola.withTag(`sophie:${loggerName}`); | 31 | prefix.apply(loglevel, { |
32 | format(level, name, timestamp) { | ||
33 | let shortName = 'global'; | ||
34 | if (name !== undefined) { | ||
35 | const nameSegments = name.split(':'); | ||
36 | const lastSegment = nameSegments.pop(); | ||
37 | shortName = [...nameSegments.map((segment) => segment[0]), lastSegment].join(':'); | ||
38 | } | ||
39 | if (isDevelopment) { | ||
40 | // `watch.js` already appends timestamps. | ||
41 | return `${level} (${shortName})`; | ||
42 | } | ||
43 | return `[${timestamp}] ${level} (${shortName})`; | ||
44 | }, | ||
45 | }); | ||
46 | |||
47 | export function getLogger(loggerName: string): Logger { | ||
48 | return loglevel.getLogger(`sophie:${loggerName}`); | ||
33 | } | 49 | } |