Quellcode durchsuchen

Avoid analytics exception when disabled (#684)

* log: Logs when analytics are disposed, drops events early.

* fix: Adds a missing parameter to a function call.
dev1
bgrozev vor 7 Jahren
Ursprung
Commit
60f4769da2
3 geänderte Dateien mit 10 neuen und 1 gelöschten Zeilen
  1. 1
    0
      JitsiMeetJS.js
  2. 2
    1
      modules/RTC/ScreenObtainer.js
  3. 7
    0
      modules/statistics/AnalyticsAdapter.js

+ 1
- 0
JitsiMeetJS.js Datei anzeigen

@@ -130,6 +130,7 @@ export default {
130 130
         }
131 131
 
132 132
         if (options.enableAnalyticsLogging !== true) {
133
+            logger.warn('Analytics disabled, disposing.');
133 134
             this.analytics.dispose();
134 135
         }
135 136
 

+ 2
- 1
modules/RTC/ScreenObtainer.js Datei anzeigen

@@ -295,7 +295,8 @@ const ScreenObtainer = {
295 295
                     if (firefoxExtInstalled === null) {
296 296
                         firefoxExtInstalled = false;
297 297
                     }
298
-                    this.obtainScreenOnFirefox(callback, errorCallback);
298
+                    this.obtainScreenOnFirefox(
299
+                        options, callback, errorCallback);
299 300
                 },
300 301
                 300);
301 302
             logger.log(

+ 7
- 0
modules/statistics/AnalyticsAdapter.js Datei anzeigen

@@ -105,6 +105,7 @@ class AnalyticsAdapter {
105 105
      * Dispose analytics. Clears all handlers.
106 106
      */
107 107
     dispose() {
108
+        logger.warn('Disposing of analytics adapter.');
108 109
         this.setAnalyticsHandlers([]);
109 110
         this.disposed = true;
110 111
     }
@@ -173,6 +174,12 @@ class AnalyticsAdapter {
173 174
      * event, if eventName is a string.
174 175
      */
175 176
     sendEvent(eventName, properties = {}) {
177
+        if (this.disposed) {
178
+            logger.warn('Not sending an event, disposed.');
179
+
180
+            return;
181
+        }
182
+
176 183
         let event = null;
177 184
 
178 185
         if (typeof eventName === 'string') {

Laden…
Abbrechen
Speichern