From d9a48478ecd6e65881812e46e7e6b1df103ede03 Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@nonnenberg.com>
Date: Thu, 30 Nov 2017 11:56:46 -0800
Subject: [PATCH] Logging for prekey fetches, load of log files (#1836)

* Log the files discovered in logPath

I've encountered some logs which include very old entries; and my
suspicion is that we're not cleaning up old log files properly.

* Log prekey fetches (success and failure), just like signed keys

* Force log file information into the final web-ready log
---
 app/logging.js              | 11 +++++++++++
 js/signal_protocol_store.js | 10 +++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/app/logging.js b/app/logging.js
index a7966d257..1257c24d0 100644
--- a/app/logging.js
+++ b/app/logging.js
@@ -93,8 +93,19 @@ function fetch(logPath) {
     return path.join(logPath, file)
   });
 
+  // creating a manual log entry for the final log result
+  var now = new Date();
+  const fileListEntry = {
+    level: 30, // INFO
+    time: now.toJSON(),
+    msg: 'Loaded this list of log files from logPath: ' + files.join(', '),
+  };
+
   return Promise.all(paths.map(fetchLog)).then(function(results) {
     const data = _.flatten(results);
+
+    data.push(fileListEntry);
+
     return _.sortBy(data, 'time');
   });
 }
diff --git a/js/signal_protocol_store.js b/js/signal_protocol_store.js
index a744a703f..3aacab0ea 100644
--- a/js/signal_protocol_store.js
+++ b/js/signal_protocol_store.js
@@ -186,11 +186,15 @@
             var prekey = new PreKey({id: keyId});
             return new Promise(function(resolve) {
                 prekey.fetch().then(function() {
+                    console.log('Successfully fetched prekey:', keyId);
                     resolve({
-                        pubKey: prekey.attributes.publicKey,
-                        privKey: prekey.attributes.privateKey
+                        pubKey: prekey.get('publicKey'),
+                        privKey: prekey.get('privateKey'),
                     });
-                }).fail(resolve);
+                }, function() {
+                    console.log('Failed to load prekey:', keyId);
+                    resolve();
+                });
             });
         },
         storePreKey: function(keyId, keyPair) {