Merge branch 'stop-logging-problem-report-args'

2 files changed, 7 insertions, 5 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6cb4d3dbbc..6bc3f00768 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -50,6 +50,8 @@ Line wrap the file at 100 chars.                                              Th
 
 ### Fixed
 - Fix `mullvad relay update` to trigger a relay list download even if the existing cache is new.
+- Don't include problem-report arguments in error logging. Stops user email from ending up in the
+  log file on error.
 
 #### Android
 - Show WireGuard key age in local timezone instead of UTC.
diff --git a/gui/src/main/index.ts b/gui/src/main/index.ts
index 0672effcca..6b91926533 100644
--- a/gui/src/main/index.ts
+++ b/gui/src/main/index.ts
@@ -1006,8 +1006,8 @@ class ApplicationMain {
           if (error) {
             log.error(
               `Failed to collect a problem report.
-             Stdout: ${stdout.toString()}
-             Stderr: ${stderr.toString()}`,
+              Stdout: ${stdout.toString()}
+              Stderr: ${stderr.toString()}`,
             );
 
             event.sender.send('collect-logs-reply', requestId, {
@@ -1041,9 +1041,9 @@ class ApplicationMain {
         execFile(executable, args, { windowsHide: true }, (error, stdout, stderr) => {
           if (error) {
             log.error(
-              `Failed to send a problem report: ${error.message}
-           Stdout: ${stdout.toString()}
-           Stderr: ${stderr.toString()}`,
+              `Failed to send a problem report.
+              Stdout: ${stdout.toString()}
+              Stderr: ${stderr.toString()}`,
             );
 
             event.sender.send('send-problem-report-reply', requestId, {