feat: distinguish between network and infra... failure

jitsi · Dec 1, 2016 · 44beed6 · 44beed6
1 parent 2352811
commit 44beed6
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 9 deletions.
diff --git a/conference.js b/conference.js
@@ -387,7 +387,8 @@ class ConferenceConnector {
             // the app. Both the errors above are unrecoverable from the library
             // perspective.
             room.leave().then(() => connection.disconnect());
-            APP.UI.showPageReloadOverlay(err);
+            APP.UI.showPageReloadOverlay(
+                false /* not a network type of failure */, err);
             break;
 
         case ConferenceErrors.CONFERENCE_MAX_USERS:
@@ -545,12 +546,16 @@ export default {
      */
     _bindConnectionFailedHandler (connection) {
         const handler = function (error, errMsg) {
-            if (ConnectionErrors.OTHER_ERROR === error) {
+            if (ConnectionErrors.OTHER_ERROR === error ||
+                ConnectionErrors.SERVER_ERROR === error) {
                 // - item-not-found
                 // - connection dropped(closed by Strophe unexpectedly
                 //   possible due too many transport errors)
+                const isNetworkFailure
+                    = error !== ConnectionErrors.SERVER_ERROR;
                 logger.error("XMPP connection error: " + errMsg);
                 APP.UI.showPageReloadOverlay(
+                    isNetworkFailure,
                     "xmpp-conn-dropped:" + errMsg);
                 connection.removeEventListener(
                     ConnectionEvents.CONNECTION_FAILED, handler);

diff --git a/logging_config.js b/logging_config.js
@@ -1,10 +1,9 @@
 // Logging configuration
 var loggingConfig = { // eslint-disable-line no-unused-vars
     //default log level for the app and lib-jitsi-meet
-    //defaultLogLevel: 'trace',
+    defaultLogLevel: 'trace',
     // Option to disable LogCollector (which stores the logs on CallStats)
     //disableLogCollector: true,
-    // Examples:
-    //'modules/version/ComponentsVersions.js': 'info',
-    //'modules/xmpp/ChatRoom.js': 'log'
+    // Logging level adjustments for verbose modules:
+    'modules/xmpp/strophe.util.js': 'log'
 };
diff --git a/modules/UI/UI.js b/modules/UI/UI.js
@@ -1093,12 +1093,15 @@ UI.notifyFocusDisconnected = function (focus, retrySec) {
  * Notify the user that the video conferencing service is badly broken and
  * the page should be reloaded.
  *
+ * @param {boolean} isNetworkFailure <tt>true</tt> indicates that it's caused by
+ * network related failure or <tt>false</tt> when it's the infrastructure.
  * @param {string} a label string identifying the reason for the page reload
  * which will be included in details of the log event.
  */
-UI.showPageReloadOverlay = function (reason) {
+UI.showPageReloadOverlay = function (isNetworkFailure, reason) {
     // Reload the page after 10 - 30 seconds
-    PageReloadOverlay.show(10 + RandomUtil.randomInt(0, 20), reason);
+    PageReloadOverlay.show(
+        10 + RandomUtil.randomInt(0, 20), isNetworkFailure, reason);
 };
 
 /**

diff --git a/modules/UI/reload_overlay/PageReloadOverlay.js b/modules/UI/reload_overlay/PageReloadOverlay.js
@@ -113,10 +113,13 @@ export default {
      *
      * @param {number} timeoutSeconds how many seconds before the conference
      * reload will happen.
+     * @param {boolean} isNetworkFailure <tt>true</tt> indicates that it's
+     * caused by network related failure or <tt>false</tt> when it's
+     * the infrastructure.
      * @param {string} reason a label string identifying the reason for the page
      * reload which will be included in details of the log event
      */
-    show(timeoutSeconds, reason) {
+    show(timeoutSeconds, isNetworkFailure, reason) {
 
         if (!overlay) {
             overlay = new PageReloadOverlayImpl(timeoutSeconds);