From 3fb6ab295f43a63bf3fd1a0e36f849bce922ced1 Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@signal.org>
Date: Tue, 19 Feb 2019 15:15:43 -0800
Subject: [PATCH] Debug log optimizations and improvements

---
 app/global_errors.js              | 3 ++-
 app/logging.js                    | 4 +++-
 js/modules/backup.js              | 1 -
 libtextsecure/message_receiver.js | 4 +---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/global_errors.js b/app/global_errors.js
index 2966ab7939..de5d0e6c02 100644
--- a/app/global_errors.js
+++ b/app/global_errors.js
@@ -3,6 +3,7 @@ const electron = require('electron');
 const Errors = require('../js/modules/types/errors');
 
 const { app, dialog, clipboard } = electron;
+const { redactAll } = require('../js/modules/privacy');
 
 // We're using hard-coded strings in this file because it needs to be ready
 //   to report errors before we do anything in the app. Also, we expect users to directly
@@ -23,7 +24,7 @@ function handleError(prefix, error) {
     });
 
     if (buttonIndex === 1) {
-      clipboard.writeText(`${prefix}\n${error.stack}`);
+      clipboard.writeText(`${prefix}\n${redactAll(error.stack)}`);
     }
   } else {
     dialog.showErrorBox(prefix, error.stack);
diff --git a/app/logging.js b/app/logging.js
index a9492be27c..ba4f98231d 100644
--- a/app/logging.js
+++ b/app/logging.js
@@ -12,6 +12,8 @@ const readFirstLine = require('firstline');
 const readLastLines = require('read-last-lines').read;
 const rimraf = require('rimraf');
 
+const { redactAll } = require('../js/modules/privacy');
+
 const { app, ipcMain: ipc } = electron;
 const LEVELS = ['fatal', 'error', 'warn', 'info', 'debug', 'trace'];
 let logger;
@@ -247,7 +249,7 @@ function logAtLevel(level, ...args) {
 
       return item;
     });
-    logger[level](str.join(' '));
+    logger[level](redactAll(str.join(' ')));
   } else {
     console._log(...args);
   }
diff --git a/js/modules/backup.js b/js/modules/backup.js
index 3a9a4e80e9..571b0e57d4 100644
--- a/js/modules/backup.js
+++ b/js/modules/backup.js
@@ -1204,7 +1204,6 @@ function createTempDir() {
 }
 
 function deleteAll(pattern) {
-  window.log.info(`Deleting ${pattern}`);
   return pify(rimraf)(pattern);
 }
 
diff --git a/libtextsecure/message_receiver.js b/libtextsecure/message_receiver.js
index 1892812e2b..0a0dc60621 100644
--- a/libtextsecure/message_receiver.js
+++ b/libtextsecure/message_receiver.js
@@ -588,9 +588,7 @@ MessageReceiver.prototype.extend({
 
     return promise.catch(error => {
       window.log.error(
-        'queueDecryptedEnvelope error handling envelope',
-        id,
-        ':',
+        `queueDecryptedEnvelope error handling envelope ${id}:`,
         error && error.stack ? error.stack : error
       );
     });