summaryrefslogtreecommitdiffhomepage
path: root/gui/src/shared
diff options
context:
space:
mode:
authorOskar Nyberg <oskar@mullvad.net>2021-02-23 12:30:17 +0100
committerOskar Nyberg <oskar@mullvad.net>2021-02-23 12:30:17 +0100
commite92be2d1736cc2b4e64965a3291325ffe8a637db (patch)
treea154472a4a415ae562956fd435d917f8a305df13 /gui/src/shared
parenta6213b703db127554953d4fb4bbcc58dded97861 (diff)
parent8f2c906eff0194d2142301c9f794609f04e2dd7a (diff)
downloadmullvadvpn-e92be2d1736cc2b4e64965a3291325ffe8a637db.tar.xz
mullvadvpn-e92be2d1736cc2b4e64965a3291325ffe8a637db.zip
Merge branch 'improve-logger'
Diffstat (limited to 'gui/src/shared')
-rw-r--r--gui/src/shared/logging.ts7
1 files changed, 6 insertions, 1 deletions
diff --git a/gui/src/shared/logging.ts b/gui/src/shared/logging.ts
index 43d0b271d9..84eaa5f25c 100644
--- a/gui/src/shared/logging.ts
+++ b/gui/src/shared/logging.ts
@@ -14,7 +14,8 @@ export class Logger {
public log(level: LogLevel, ...data: unknown[]) {
const time = moment().format('YYYY-MM-DD HH:mm:ss.SSS');
- const message = `[${time}][${LogLevel[level]}] ${data.join(' ')}`;
+ const stringifiedData = data.map(this.stringifyData).join(' ');
+ const message = `[${time}][${LogLevel[level]}] ${stringifiedData}`;
this.outputMessage(level, message);
}
@@ -29,6 +30,10 @@ export class Logger {
this.outputs.forEach((output) => output.dispose?.());
}
+ private stringifyData(data: unknown): string {
+ return typeof data === 'string' ? data : JSON.stringify(data);
+ }
+
private outputMessage(level: LogLevel, message: string) {
this.outputs
.filter((output) => level <= output.level)