diff --git a/html5/verto/js/src/jquery.jsonrpcclient.js b/html5/verto/js/src/jquery.jsonrpcclient.js index 7f5a68753a..5beb85fc50 100644 --- 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 50fda9149a..c913ca4140 100644 --- 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 ae044c8e1c..a4a4bafad2 100644 --- 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 b885f47154..348412a261 100644 --- 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",