Quellcode durchsuchen

ref(JingleSessionPC): do not log whole objects

Do not log whole objects on Jingle error, as these may cause trouble on
iOS react-native.
dev1
paweldomas vor 8 Jahren
Ursprung
Commit
67b49440dc
1 geänderte Dateien mit 11 neuen und 18 gelöschten Zeilen
  1. 11
    18
      modules/xmpp/JingleSessionPC.js

+ 11
- 18
modules/xmpp/JingleSessionPC.js Datei anzeigen

@@ -2040,10 +2040,7 @@ export default class JingleSessionPC extends JingleSession {
2040 2040
             logger.info('Sending source-remove', remove.tree());
2041 2041
             this.connection.sendIQ(
2042 2042
                 remove, null,
2043
-                this.newJingleErrorHandler(remove, error => {
2044
-                    GlobalOnErrorHandler.callErrorHandler(
2045
-                        new Error(`Jingle error: ${JSON.stringify(error)}`));
2046
-                }), IQ_TIMEOUT);
2043
+                this.newJingleErrorHandler(remove), IQ_TIMEOUT);
2047 2044
         } else {
2048 2045
             logger.log('removal not necessary');
2049 2046
         }
@@ -2065,10 +2062,7 @@ export default class JingleSessionPC extends JingleSession {
2065 2062
         if (containsNewSSRCs) {
2066 2063
             logger.info('Sending source-add', add.tree());
2067 2064
             this.connection.sendIQ(
2068
-                add, null, this.newJingleErrorHandler(add, error => {
2069
-                    GlobalOnErrorHandler.callErrorHandler(
2070
-                        new Error(`Jingle error: ${JSON.stringify(error)}`));
2071
-                }), IQ_TIMEOUT);
2065
+                add, null, this.newJingleErrorHandler(add), IQ_TIMEOUT);
2072 2066
         } else {
2073 2067
             logger.log('addition not necessary');
2074 2068
         }
@@ -2107,20 +2101,18 @@ export default class JingleSessionPC extends JingleSession {
2107 2101
                 if (errorReasonSel.length) {
2108 2102
                     error.reason = errorReasonSel[0].tagName;
2109 2103
                 }
2104
+
2105
+                const errorMsgSel = errorElSel.find('>text');
2106
+
2107
+                if (errorMsgSel.length) {
2108
+                    error.msg = errorMsgSel.text();
2109
+                }
2110 2110
             }
2111 2111
 
2112 2112
             if (!errResponse) {
2113 2113
                 error.reason = 'timeout';
2114 2114
             }
2115 2115
 
2116
-            error.source = request;
2117
-            if (request && typeof request.tree === 'function') {
2118
-                error.source = request.tree();
2119
-            }
2120
-            if (error.source && error.source.outerHTML) {
2121
-                error.source = error.source.outerHTML;
2122
-            }
2123
-
2124 2116
             error.session = this.toString();
2125 2117
 
2126 2118
             if (failureCb) {
@@ -2132,10 +2124,11 @@ export default class JingleSessionPC extends JingleSession {
2132 2124
                 // it will first send us 'session-terminate' (we enter ENDED)
2133 2125
                 // and then follow with 'item-not-found' for the queued requests
2134 2126
                 // We don't want to have that logged on error level.
2135
-                logger.debug('Jingle error', error);
2127
+                logger.debug(`Jingle error: ${JSON.stringify(error)}`);
2136 2128
             } else {
2137 2129
                 GlobalOnErrorHandler.callErrorHandler(
2138
-                    new Error(`Jingle error: ${JSON.stringify(error)}`));
2130
+                    new Error(
2131
+                        `Jingle error: ${JSON.stringify(error)}`));
2139 2132
             }
2140 2133
         };
2141 2134
     }

Laden…
Abbrechen
Speichern