FS-11262 [verto_communicator] prevent vertojs from stop retrying socket connection...

diff --git a/html5/verto/js/src/jquery.jsonrpcclient.js b/html5/verto/js/src/jquery.jsonrpcclient.js
index 7f5a68753a090b78d624564fc051482d7276e476..5beb85fc503887f3c6b3403dae953f00e8294ba8 100644 (file)
--- a/html5/verto/js/src/jquery.jsonrpcclient.js
+++ b/html5/verto/js/src/jquery.jsonrpcclient.js
@@ -322,8 +322,8 @@
                         self.options.onWSClose(self);
                     }
 
-                    if (self.ws_cnt > 10) {
-                      self.options.socketUrl = self.options.socketFallbackUrl;
+                    if (self.ws_cnt > 10 && self.options.wsFallbackURL) {
+                      self.options.socketUrl = self.options.wsFallbackURL;
                     }
 
                     console.error("Websocket Lost " + self.ws_cnt + " sleep: " + self.ws_sleep + "msec");

diff --git a/html5/verto/js/src/jquery.verto.js b/html5/verto/js/src/jquery.verto.js
index 50fda9149aafdbc812fe53a46108c51e13c4b434..c913ca41404ed45275a15b18f2f97e0e22fd99ed 100644 (file)
--- a/html5/verto/js/src/jquery.verto.js
+++ b/html5/verto/js/src/jquery.verto.js
@@ -110,7 +110,7 @@
             login: verto.options.login,
             passwd: verto.options.passwd,
             socketUrl: verto.options.socketUrl,
-            socketFallbackUrl: verto.options.socketFallbackUrl,
+            wsFallbackURL: verto.options.wsFallbackURL,
             turnServer: verto.options.turnServer,
            loginParams: verto.options.loginParams,
            userVariables: verto.options.userVariables,

diff --git a/html5/verto/verto_communicator/src/config.json.sample b/html5/verto/verto_communicator/src/config.json.sample
index ae044c8e1cefc0c8fb135f49f69cd5a34bb9d6d7..a4a4bafad2c71109f92e86ce332f225c83884365 100644 (file)
--- a/html5/verto/verto_communicator/src/config.json.sample
+++ b/html5/verto/verto_communicator/src/config.json.sample
@@ -10,7 +10,7 @@
       "autocall": "3500",
       "googlelogin": "true",
       "wsURL": "wss://gamma.tollfreegateway.com/wss2",
-      "socketFallbackUrl": "wss://gamma.tollfreegateway.com/wss2",
+      "wsFallbackURL": "wss://gamma.tollfreegateway.com/wss2",
       "turnServer": {
          "urls": "turn:someturnserver.com:443?transport=tcp",
          "credential": "1234",

diff --git a/html5/verto/verto_communicator/src/vertoService/services/vertoService.js b/html5/verto/verto_communicator/src/vertoService/services/vertoService.js
index b885f47154f6b3dcd7387fe40f0d9480814b962d..348412a26132008cf4dad9ec1472dee6e61eed1e 100644 (file)
--- a/html5/verto/verto_communicator/src/vertoService/services/vertoService.js
+++ b/html5/verto/verto_communicator/src/vertoService/services/vertoService.js
@@ -175,7 +175,7 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
       password: $cookieStore.get('verto_demo_passwd') || "1234",
       hostname: window.location.hostname,
       wsURL: ("wss://" + window.location.hostname + ":8082"),
-      socketFallbackUrl: null,
+      wsFallbackURL: null,
       turnServer: null,
       resCheckEnded: false
     };
@@ -735,7 +735,7 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
             login: data.login + '@' + data.hostname,
             passwd: data.password,
             socketUrl: data.wsURL,
-            socketFallbackUrl: data.socketFallbackUrl,
+            wsFallbackURL: data.wsFallbackURL,
             turnServer: data.turnServer,
             tag: "webcam",
             ringFile: "sounds/bell_ring2.wav",