From 26dc6a4ac2015850132d8aed92ff8f6ad6bd1eda Mon Sep 17 00:00:00 2001
From: paweldomas <pawel.domas@jitsi.org>
Date: Tue, 15 Oct 2019 15:47:23 -0500
Subject: [PATCH] update logger and LJM to support log timestamps

---
 package-lock.json                                  | 10 +++++-----
 package.json                                       |  4 ++--
 react/features/base/logging/JitsiMeetLogStorage.js | 12 ++++++------
 react/features/base/logging/LogTransport.native.js |  3 ++-
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b79726742..27eb7a24a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11200,8 +11200,8 @@
       "integrity": "sha512-+f/4OLeqY8RAmXnonI1ffeY1DR8kMNJPhv5WMFehchf7U71cjMQVKkOz1n6asz6kfVoAqKNWJz1A/18i18AcXA=="
     },
     "jitsi-meet-logger": {
-      "version": "github:jitsi/jitsi-meet-logger#a885cc98688ef2c3972284bda901596a26ffee52",
-      "from": "github:jitsi/jitsi-meet-logger#a885cc98688ef2c3972284bda901596a26ffee52"
+      "version": "github:jitsi/jitsi-meet-logger#5ec92357570dc8f0b7ffc1528820721c84c6af8b",
+      "from": "github:jitsi/jitsi-meet-logger#5ec92357570dc8f0b7ffc1528820721c84c6af8b"
     },
     "jquery": {
       "version": "3.4.0",
@@ -11469,14 +11469,14 @@
       }
     },
     "lib-jitsi-meet": {
-      "version": "github:jitsi/lib-jitsi-meet#f9808adb8eb523bae3318f9f8ef49b544651485f",
-      "from": "github:jitsi/lib-jitsi-meet#f9808adb8eb523bae3318f9f8ef49b544651485f",
+      "version": "github:jitsi/lib-jitsi-meet#cdd2029b4b6b3626658f9834c324e1ffb7474795",
+      "from": "github:jitsi/lib-jitsi-meet#cdd2029b4b6b3626658f9834c324e1ffb7474795",
       "requires": {
         "@jitsi/sdp-interop": "0.1.14",
         "@jitsi/sdp-simulcast": "0.2.2",
         "async": "0.9.0",
         "current-executing-script": "0.1.3",
-        "jitsi-meet-logger": "github:jitsi/jitsi-meet-logger#a885cc98688ef2c3972284bda901596a26ffee52",
+        "jitsi-meet-logger": "github:jitsi/jitsi-meet-logger#5ec92357570dc8f0b7ffc1528820721c84c6af8b",
         "js-utils": "github:jitsi/js-utils#446497893023aa8dec403e0e4e35a22cae6bc87d",
         "lodash.isequal": "4.5.0",
         "sdp-transform": "2.3.0",
diff --git a/package.json b/package.json
index 7b83e3cf6..801a0728f 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
     "i18next-browser-languagedetector": "3.0.1",
     "i18next-xhr-backend": "3.0.0",
     "jQuery-Impromptu": "github:trentrichardson/jQuery-Impromptu#v6.0.0",
-    "jitsi-meet-logger": "github:jitsi/jitsi-meet-logger#a885cc98688ef2c3972284bda901596a26ffee52",
+    "jitsi-meet-logger": "github:jitsi/jitsi-meet-logger#5ec92357570dc8f0b7ffc1528820721c84c6af8b",
     "jquery": "3.4.0",
     "jquery-contextmenu": "2.4.5",
     "jquery-i18next": "1.2.1",
@@ -57,7 +57,7 @@
     "js-utils": "github:jitsi/js-utils#192b1c996e8c05530eb1f19e82a31069c3021e31",
     "jsrsasign": "8.0.12",
     "jwt-decode": "2.2.0",
-    "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#f9808adb8eb523bae3318f9f8ef49b544651485f",
+    "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#cdd2029b4b6b3626658f9834c324e1ffb7474795",
     "libflacjs": "github:mmig/libflac.js#93d37e7f811f01cf7d8b6a603e38bd3c3810907d",
     "lodash": "4.17.13",
     "moment": "2.19.4",
diff --git a/react/features/base/logging/JitsiMeetLogStorage.js b/react/features/base/logging/JitsiMeetLogStorage.js
index adaf50527..4931c798f 100644
--- a/react/features/base/logging/JitsiMeetLogStorage.js
+++ b/react/features/base/logging/JitsiMeetLogStorage.js
@@ -63,13 +63,13 @@ export default class JitsiMeetLogStorage {
         for (let i = 0, len = logEntries.length; i < len; i++) {
             const logEntry = logEntries[i];
 
-            if (typeof logEntry === 'object') {
-                // Aggregated message
-                logMessage += `(${logEntry.count}) ${logEntry.text}\n`;
-            } else {
-                // Regular message
-                logMessage += `${logEntry}\n`;
+            if (logEntry.timestamp) {
+                logMessage += `${logEntry.timestamp} `;
             }
+            if (logEntry.count > 1) {
+                logMessage += `(${logEntry.count}) `;
+            }
+            logMessage += `${logEntry.text}\n`;
         }
         logMessage += '"}';
 
diff --git a/react/features/base/logging/LogTransport.native.js b/react/features/base/logging/LogTransport.native.js
index 7ddb186fb..2f3e67fcc 100644
--- a/react/features/base/logging/LogTransport.native.js
+++ b/react/features/base/logging/LogTransport.native.js
@@ -39,7 +39,8 @@ function buildTransport() {
         'warn',
         'error'
     ].reduce((logger, logName) => {
-        logger[logName] = (...args: Array<string>) => {
+        logger[logName] = (timestamp: string, ...args: Array<string>) => {
+            // It ignores the timestamp argument, because LogBridge will add it on the native side anyway
             const nargs = args.map(arg => {
                 if (arg instanceof Error) {
                     const errorBody = {