From ccb5ff79d45692a8b865e62ccd3539ff0d03c27a Mon Sep 17 00:00:00 2001
From: sachaaaaa <sacha@loki.network>
Date: Wed, 21 Nov 2018 15:06:22 +1100
Subject: [PATCH] Use correct log level in development mode and use log.debug()
 for some of the reoccurring logs

---
 js/logging.js                     | 14 +++++++++++++-
 js/modules/loki_message_api.js    |  8 ++++----
 libtextsecure/message_receiver.js |  2 +-
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/js/logging.js b/js/logging.js
index 4d749178b..f93073362 100644
--- a/js/logging.js
+++ b/js/logging.js
@@ -53,6 +53,12 @@ function log(...args) {
 if (window.console) {
   console._log = console.log;
   console.log = log;
+  console._trace = console.trace;
+  console._debug = console.debug
+  console._info = console.info;
+  console._warn = console.warn;
+  console._error = console.error;
+  console._fatal = console.error;
 }
 
 // The mechanics of preparing a log for publish
@@ -95,12 +101,18 @@ function fetch() {
 }
 
 const publish = debuglogs.upload;
+const development = (window.getEnvironment() !== 'production');
 
 // A modern logging interface for the browser
 
 // The Bunyan API: https://github.com/trentm/node-bunyan#log-method-api
 function logAtLevel(level, prefix, ...args) {
-  console._log(prefix, now(), ...args);
+  if (development) {
+    const fn = `_${level}`;
+    console[fn](prefix, now(), ...args);
+  } else {
+    console._log(prefix, now(), ...args);
+  }
 
   const str = cleanArgsForIPC(args);
   const logText = Privacy.redactAll(str);
diff --git a/js/modules/loki_message_api.js b/js/modules/loki_message_api.js
index b73717373..e524cbf6c 100644
--- a/js/modules/loki_message_api.js
+++ b/js/modules/loki_message_api.js
@@ -73,7 +73,7 @@ class LokiServer {
       timeout: undefined,
     };
 
-    log.info(options.type, options.url);
+    log.debug(options.type, options.url);
 
     const fetchOptions = {
       method: options.type,
@@ -108,7 +108,7 @@ class LokiServer {
     }
 
     if (response.status >= 0 && response.status < 400) {
-      log.info(options.type, options.url, response.status, 'Success');
+      log.debug(options.type, options.url, response.status, 'Success');
       return result;
     }
     log.error(options.type, options.url, response.status, 'Error');
@@ -126,7 +126,7 @@ class LokiServer {
       timeout: undefined,
     };
 
-    log.info(options.type, options.url);
+    log.debug(options.type, options.url);
 
     const headers = {
       'X-Loki-recipient': pubKey,
@@ -163,7 +163,7 @@ class LokiServer {
     }
 
     if (response.status >= 0 && response.status < 400) {
-      log.info(options.type, options.url, response.status, 'Success');
+      log.debug(options.type, options.url, response.status, 'Success');
       if (result.lastHash) {
         currentNode.lastHash = result.lastHash;
       }
diff --git a/libtextsecure/message_receiver.js b/libtextsecure/message_receiver.js
index ad83b9b8c..0740becc3 100644
--- a/libtextsecure/message_receiver.js
+++ b/libtextsecure/message_receiver.js
@@ -365,7 +365,7 @@ MessageReceiver.prototype.extend({
     this.incoming = [];
 
     const dispatchEmpty = () => {
-      window.log.info("MessageReceiver: emitting 'empty' event");
+      window.log.debug("MessageReceiver: emitting 'empty' event");
       const ev = new Event('empty');
       return this.dispatchAndWait(ev);
     };