summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorOskar Nyberg <oskar@mullvad.net>2021-05-27 15:59:21 +0200
committerOskar Nyberg <oskar@mullvad.net>2021-05-27 15:59:21 +0200
commit79b5f6f600d8f1a1ffcd6ab4890064409c683061 (patch)
tree7a0d5140736eb02499e5ad7449e7af60b298eb19
parent1dc96b8ac54f3ff99ae64c32cd79a68fbd08c146 (diff)
parent41a23dec63ceb506f2e64e4956782f7a51ce7986 (diff)
downloadmullvadvpn-79b5f6f600d8f1a1ffcd6ab4890064409c683061.tar.xz
mullvadvpn-79b5f6f600d8f1a1ffcd6ab4890064409c683061.zip
Merge branch 'improve-sandbox-status-log-message'
-rw-r--r--gui/src/main/index.ts2
-rw-r--r--gui/src/shared/logging.ts4
2 files changed, 4 insertions, 2 deletions
diff --git a/gui/src/main/index.ts b/gui/src/main/index.ts
index f6c3d58f3f..60ddcce4bc 100644
--- a/gui/src/main/index.ts
+++ b/gui/src/main/index.ts
@@ -226,7 +226,7 @@ class ApplicationMain {
this.initLogging();
- log.debug(`Chromium sandbox disabled: ${SANDBOX_DISABLED}`);
+ log.debug(`Chromium sandbox is ${SANDBOX_DISABLED ? 'disabled' : 'enabled'}`);
if (!SANDBOX_DISABLED) {
app.enableSandbox();
}
diff --git a/gui/src/shared/logging.ts b/gui/src/shared/logging.ts
index f8c71fc41e..d87778bf13 100644
--- a/gui/src/shared/logging.ts
+++ b/gui/src/shared/logging.ts
@@ -56,7 +56,9 @@ export class Logger {
try {
await maybePromise;
} catch (e) {
- console.error(`${output.constructor.name}.write: ${e.message}`);
+ console.error(
+ `${output.constructor.name}.write: ${e.message}. Original message: ${message}`,
+ );
}
}
});