Przeglądaj źródła

update logger and LJM to support log timestamps

master
paweldomas 6 lat temu
rodzic
commit
26dc6a4ac2

+ 5
- 5
package-lock.json Wyświetl plik

@@ -11200,8 +11200,8 @@
11200 11200
       "integrity": "sha512-+f/4OLeqY8RAmXnonI1ffeY1DR8kMNJPhv5WMFehchf7U71cjMQVKkOz1n6asz6kfVoAqKNWJz1A/18i18AcXA=="
11201 11201
     },
11202 11202
     "jitsi-meet-logger": {
11203
-      "version": "github:jitsi/jitsi-meet-logger#a885cc98688ef2c3972284bda901596a26ffee52",
11204
-      "from": "github:jitsi/jitsi-meet-logger#a885cc98688ef2c3972284bda901596a26ffee52"
11203
+      "version": "github:jitsi/jitsi-meet-logger#5ec92357570dc8f0b7ffc1528820721c84c6af8b",
11204
+      "from": "github:jitsi/jitsi-meet-logger#5ec92357570dc8f0b7ffc1528820721c84c6af8b"
11205 11205
     },
11206 11206
     "jquery": {
11207 11207
       "version": "3.4.0",
@@ -11469,14 +11469,14 @@
11469 11469
       }
11470 11470
     },
11471 11471
     "lib-jitsi-meet": {
11472
-      "version": "github:jitsi/lib-jitsi-meet#f9808adb8eb523bae3318f9f8ef49b544651485f",
11473
-      "from": "github:jitsi/lib-jitsi-meet#f9808adb8eb523bae3318f9f8ef49b544651485f",
11472
+      "version": "github:jitsi/lib-jitsi-meet#cdd2029b4b6b3626658f9834c324e1ffb7474795",
11473
+      "from": "github:jitsi/lib-jitsi-meet#cdd2029b4b6b3626658f9834c324e1ffb7474795",
11474 11474
       "requires": {
11475 11475
         "@jitsi/sdp-interop": "0.1.14",
11476 11476
         "@jitsi/sdp-simulcast": "0.2.2",
11477 11477
         "async": "0.9.0",
11478 11478
         "current-executing-script": "0.1.3",
11479
-        "jitsi-meet-logger": "github:jitsi/jitsi-meet-logger#a885cc98688ef2c3972284bda901596a26ffee52",
11479
+        "jitsi-meet-logger": "github:jitsi/jitsi-meet-logger#5ec92357570dc8f0b7ffc1528820721c84c6af8b",
11480 11480
         "js-utils": "github:jitsi/js-utils#446497893023aa8dec403e0e4e35a22cae6bc87d",
11481 11481
         "lodash.isequal": "4.5.0",
11482 11482
         "sdp-transform": "2.3.0",

+ 2
- 2
package.json Wyświetl plik

@@ -49,7 +49,7 @@
49 49
     "i18next-browser-languagedetector": "3.0.1",
50 50
     "i18next-xhr-backend": "3.0.0",
51 51
     "jQuery-Impromptu": "github:trentrichardson/jQuery-Impromptu#v6.0.0",
52
-    "jitsi-meet-logger": "github:jitsi/jitsi-meet-logger#a885cc98688ef2c3972284bda901596a26ffee52",
52
+    "jitsi-meet-logger": "github:jitsi/jitsi-meet-logger#5ec92357570dc8f0b7ffc1528820721c84c6af8b",
53 53
     "jquery": "3.4.0",
54 54
     "jquery-contextmenu": "2.4.5",
55 55
     "jquery-i18next": "1.2.1",
@@ -57,7 +57,7 @@
57 57
     "js-utils": "github:jitsi/js-utils#192b1c996e8c05530eb1f19e82a31069c3021e31",
58 58
     "jsrsasign": "8.0.12",
59 59
     "jwt-decode": "2.2.0",
60
-    "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#f9808adb8eb523bae3318f9f8ef49b544651485f",
60
+    "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#cdd2029b4b6b3626658f9834c324e1ffb7474795",
61 61
     "libflacjs": "github:mmig/libflac.js#93d37e7f811f01cf7d8b6a603e38bd3c3810907d",
62 62
     "lodash": "4.17.13",
63 63
     "moment": "2.19.4",

+ 6
- 6
react/features/base/logging/JitsiMeetLogStorage.js Wyświetl plik

@@ -63,13 +63,13 @@ export default class JitsiMeetLogStorage {
63 63
         for (let i = 0, len = logEntries.length; i < len; i++) {
64 64
             const logEntry = logEntries[i];
65 65
 
66
-            if (typeof logEntry === 'object') {
67
-                // Aggregated message
68
-                logMessage += `(${logEntry.count}) ${logEntry.text}\n`;
69
-            } else {
70
-                // Regular message
71
-                logMessage += `${logEntry}\n`;
66
+            if (logEntry.timestamp) {
67
+                logMessage += `${logEntry.timestamp} `;
72 68
             }
69
+            if (logEntry.count > 1) {
70
+                logMessage += `(${logEntry.count}) `;
71
+            }
72
+            logMessage += `${logEntry.text}\n`;
73 73
         }
74 74
         logMessage += '"}';
75 75
 

+ 2
- 1
react/features/base/logging/LogTransport.native.js Wyświetl plik

@@ -39,7 +39,8 @@ function buildTransport() {
39 39
         'warn',
40 40
         'error'
41 41
     ].reduce((logger, logName) => {
42
-        logger[logName] = (...args: Array<string>) => {
42
+        logger[logName] = (timestamp: string, ...args: Array<string>) => {
43
+            // It ignores the timestamp argument, because LogBridge will add it on the native side anyway
43 44
             const nargs = args.map(arg => {
44 45
                 if (arg instanceof Error) {
45 46
                     const errorBody = {

Ładowanie…
Anuluj
Zapisz