Selaa lähdekoodia

Transform JitsiTrackError into format acceptable by callstats

dev1
tsareg 9 vuotta sitten
vanhempi
commit
c815e913d7
2 muutettua tiedostoa jossa 16 lisäystä ja 9 poistoa
  1. 3
    6
      JitsiTrackError.js
  2. 13
    3
      modules/statistics/statistics.js

+ 3
- 6
JitsiTrackError.js Näytä tiedosto

@@ -59,8 +59,7 @@ function JitsiTrackError(error, options, devices) {
59 59
             case "PermissionDeniedError":
60 60
             case "SecurityError":
61 61
                 this.name = JitsiTrackErrors.PERMISSION_DENIED;
62
-                this.message = error.message
63
-                    || TRACK_ERROR_TO_MESSAGE_MAP[
62
+                this.message = TRACK_ERROR_TO_MESSAGE_MAP[
64 63
                         JitsiTrackErrors.PERMISSION_DENIED]
65 64
                         + (this.gum.devices || []).join(", ");
66 65
                 break;
@@ -84,15 +83,13 @@ function JitsiTrackError(error, options, devices) {
84 83
                         constraintName === "width" ||
85 84
                         constraintName === "height")) {
86 85
                     this.name = JitsiTrackErrors.UNSUPPORTED_RESOLUTION;
87
-                    this.message = error.message ||
88
-                        TRACK_ERROR_TO_MESSAGE_MAP[
86
+                    this.message = TRACK_ERROR_TO_MESSAGE_MAP[
89 87
                             JitsiTrackErrors.UNSUPPORTED_RESOLUTION] +
90 88
                         getResolutionFromFailedConstraint(constraintName,
91 89
                             options);
92 90
                 } else {
93 91
                     this.name = JitsiTrackErrors.CONSTRAINT_FAILED;
94
-                    this.message = error.message ||
95
-                        TRACK_ERROR_TO_MESSAGE_MAP[
92
+                    this.message = TRACK_ERROR_TO_MESSAGE_MAP[
96 93
                             JitsiTrackErrors.CONSTRAINT_FAILED] +
97 94
                         error.constraintName;
98 95
                 }

+ 13
- 3
modules/statistics/statistics.js Näytä tiedosto

@@ -6,6 +6,7 @@ var EventEmitter = require("events");
6 6
 var StatisticsEvents = require("../../service/statistics/Events");
7 7
 var CallStats = require("./CallStats");
8 8
 var ScriptUtil = require('../util/ScriptUtil');
9
+var JitsiTrackError = require("../../JitsiTrackError");
9 10
 
10 11
 // Since callstats.io is a third party, we cannot guarantee the quality of their
11 12
 // service. More specifically, their server may take noticeably long time to
@@ -265,8 +266,13 @@ function (ssrc, isLocal, usageLabel, containerId) {
265 266
  * @param {Error} e error to send
266 267
  */
267 268
 Statistics.prototype.sendGetUserMediaFailed = function (e) {
268
-    if(this.callstats)
269
-        CallStats.sendGetUserMediaFailed(e, this.callstats);
269
+    if(this.callstats) {
270
+        CallStats.sendGetUserMediaFailed(
271
+            e instanceof JitsiTrackError
272
+                ? formatJitsiTrackErrorForCallStats(e)
273
+                : e,
274
+            this.callstats);
275
+    }
270 276
 };
271 277
 
272 278
 /**
@@ -275,7 +281,11 @@ Statistics.prototype.sendGetUserMediaFailed = function (e) {
275 281
  * @param {Error} e error to send
276 282
  */
277 283
 Statistics.sendGetUserMediaFailed = function (e) {
278
-    CallStats.sendGetUserMediaFailed(e, null);
284
+    CallStats.sendGetUserMediaFailed(
285
+        e instanceof JitsiTrackError
286
+            ? formatJitsiTrackErrorForCallStats(e)
287
+            : e,
288
+        null);
279 289
 };
280 290
 
281 291
 /**

Loading…
Peruuta
Tallenna