summaryrefslogtreecommitdiffhomepage
path: root/gui/src
diff options
context:
space:
mode:
authorOskar Nyberg <oskar@mullvad.net>2021-01-12 13:30:23 +0100
committerOskar Nyberg <oskar@mullvad.net>2021-01-15 13:32:09 +0100
commite0e9fe815b047fbc75e3bf01eea95133ae7c035f (patch)
tree74d2d06996ceb80d759613ef5a62abf1b1674bd5 /gui/src
parent2bf7e6af77218df932980dac9c52e1173db86412 (diff)
downloadmullvadvpn-e0e9fe815b047fbc75e3bf01eea95133ae7c035f.tar.xz
mullvadvpn-e0e9fe815b047fbc75e3bf01eea95133ae7c035f.zip
Add logging call to ipc event channel
Diffstat (limited to 'gui/src')
-rw-r--r--gui/src/main/index.ts4
-rw-r--r--gui/src/shared/ipc-event-channel.ts9
2 files changed, 13 insertions, 0 deletions
diff --git a/gui/src/main/index.ts b/gui/src/main/index.ts
index 535d893bb8..efef48e033 100644
--- a/gui/src/main/index.ts
+++ b/gui/src/main/index.ts
@@ -1151,6 +1151,10 @@ class ApplicationMain {
IpcMainEventChannel.app.handleOpenUrl((url) => shell.openExternal(url));
IpcMainEventChannel.app.handleOpenPath((path) => shell.openPath(path));
IpcMainEventChannel.app.handleShowOpenDialog((options) => dialog.showOpenDialog(options));
+
+ IpcMainEventChannel.logging.handleLog(({ level, data }) =>
+ this.rendererLog?.log(LogLevels[level], ...data),
+ );
}
private async createNewAccount(): Promise<string> {
diff --git a/gui/src/shared/ipc-event-channel.ts b/gui/src/shared/ipc-event-channel.ts
index 58186a822d..19c11f85ab 100644
--- a/gui/src/shared/ipc-event-channel.ts
+++ b/gui/src/shared/ipc-event-channel.ts
@@ -26,6 +26,12 @@ import {
notifyRenderer,
send,
} from './ipc-helpers';
+import { LogLevel } from './logging-types';
+
+interface ILogEntry {
+ level: LogLevel;
+ message: string;
+}
export interface IRelayListPair {
relays: IRelayList;
@@ -182,6 +188,9 @@ const ipc = {
collectLogs: invoke<string[], string>(),
sendReport: invoke<{ email: string; message: string; savedReport: string }, void>(),
},
+ logging: {
+ log: send<ILogEntry>(),
+ },
};
export const IpcMainEventChannel = createIpcMain(ipc);