소스 검색

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 7 년 전
부모
커밋
60f4769da2
3개의 변경된 파일10개의 추가작업 그리고 1개의 파일을 삭제
  1. 1
    0
      JitsiMeetJS.js
  2. 2
    1
      modules/RTC/ScreenObtainer.js
  3. 7
    0
      modules/statistics/AnalyticsAdapter.js

+ 1
- 0
JitsiMeetJS.js 파일 보기

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

+ 2
- 1
modules/RTC/ScreenObtainer.js 파일 보기

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

+ 7
- 0
modules/statistics/AnalyticsAdapter.js 파일 보기

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

Loading…
취소
저장