summaryrefslogtreecommitdiffhomepage
path: root/gui/src/shared
diff options
context:
space:
mode:
authorOskar Nyberg <oskar@mullvad.net>2021-09-15 11:03:14 +0200
committerOskar Nyberg <oskar@mullvad.net>2021-09-16 12:04:36 +0200
commit4cea60889a5a5cd9cefc76df2afc2af612021e7e (patch)
treebfbcbd8f3bc40842fa62ac019c7517a91278ec1e /gui/src/shared
parent4d9a8206dcfc5312160a8d0b7066157c8f2a71f4 (diff)
downloadmullvadvpn-4cea60889a5a5cd9cefc76df2afc2af612021e7e.tar.xz
mullvadvpn-4cea60889a5a5cd9cefc76df2afc2af612021e7e.zip
Update catch-statements to work with unknown type
Diffstat (limited to 'gui/src/shared')
-rw-r--r--gui/src/shared/ipc-helpers.ts3
-rw-r--r--gui/src/shared/logging.ts3
2 files changed, 4 insertions, 2 deletions
diff --git a/gui/src/shared/ipc-helpers.ts b/gui/src/shared/ipc-helpers.ts
index 8c3c851a80..31469ce88a 100644
--- a/gui/src/shared/ipc-helpers.ts
+++ b/gui/src/shared/ipc-helpers.ts
@@ -180,7 +180,8 @@ function handle<T, R>(event: string, ipcMain: EIpcMain): Handler<T, Promise<R>>
ipcMain.handle(event, async (_ipcEvent, arg: T) => {
try {
return { type: 'success', value: await fn(arg) };
- } catch (error) {
+ } catch (e) {
+ const error = e as Error;
return { type: 'error', message: error.message || '' };
}
});
diff --git a/gui/src/shared/logging.ts b/gui/src/shared/logging.ts
index d87778bf13..bfde85a9da 100644
--- a/gui/src/shared/logging.ts
+++ b/gui/src/shared/logging.ts
@@ -56,8 +56,9 @@ export class Logger {
try {
await maybePromise;
} catch (e) {
+ const error = e as Error;
console.error(
- `${output.constructor.name}.write: ${e.message}. Original message: ${message}`,
+ `${output.constructor.name}.write: ${error.message}. Original message: ${message}`,
);
}
}