From 0ce56eed877dbd936b4d955a7888f290df30c52c Mon Sep 17 00:00:00 2001
From: Daniel Gasienica <daniel@signal.org>
Date: Thu, 3 May 2018 11:53:39 -0400
Subject: [PATCH] Use structured log

---
 js/models/conversations.js | 12 +++++-------
 js/models/messages.js      | 10 ++++------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/js/models/conversations.js b/js/models/conversations.js
index 9514eaf544..ace96f3d8d 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -860,14 +860,12 @@
         return Promise.resolve();
       }
 
-      console.log(
-        'Updating expireTimer for conversation',
-        this.idForLogging(),
-        'to',
+      console.log("Update conversation 'expireTimer'", {
+        id: this.idForLogging(),
         expireTimer,
-        'via',
-        source
-      );
+        source,
+      });
+
       source = source || textsecure.storage.user.getNumber();
       const timestamp = receivedAt || Date.now();
 
diff --git a/js/models/messages.js b/js/models/messages.js
index 22d4180092..9b743cd373 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -632,13 +632,11 @@
             const shouldLogExpireTimerChange =
               message.isExpirationTimerUpdate() || expireTimer;
             if (shouldLogExpireTimerChange) {
-              console.log(
-                'Updating expireTimer for conversation',
-                conversation.idForLogging(),
-                'to',
+              console.log("Update conversation 'expireTimer'", {
+                id: conversation.idForLogging(),
                 expireTimer,
-                'via `handleDataMessage`'
-              );
+                source: 'handleDataMessage',
+              });
             }
 
             if (!message.isEndSession() && !message.isGroupUpdate()) {