paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-06 15:03:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

socket: Pass wait_time as an option to _try_to_reconnect

Browse Source 
(imported from commit 15a88c6da084f4834258868bc08b2cd983899820)
This commit is contained in:
Zev Benjamin
2014-01-30 14:28:33 -05:00
committed by Steve Howell
parent 1ed176b5ef
commit b8444daddd
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
static/js/socket.js
View File

@@ -220,7 +220,7 @@ Socket.prototype = {
request.error = function (type, resp) { request.error = function (type, resp) {
blueslip.info("Could not authenticate with server: " + resp.msg); blueslip.info("Could not authenticate with server: " + resp.msg);
that._connection_failures++; that._connection_failures++;
that._try_to_reconnect(that._reconnect_wait_time()); that._try_to_reconnect({wait_time: that._reconnect_wait_time()});
}; };
that._save_request(request); that._save_request(request);
that._do_send(request); that._do_send(request);
@@ -258,7 +258,7 @@ Socket.prototype = {
+ " (" + event.code.toString() + ", " + event.reason + ")"); + " (" + event.code.toString() + ", " + event.reason + ")");
that._connection_failures++; that._connection_failures++;
that._is_reconnecting = false; that._is_reconnecting = false;
that._try_to_reconnect(that._reconnect_wait_time()); that._try_to_reconnect({wait_time: that._reconnect_wait_time()});
}; };
}, },
@@ -272,10 +272,8 @@ Socket.prototype = {
} }
}, },
_try_to_reconnect: function Socket__try_to_reconnect(wait_time) { _try_to_reconnect: function Socket__try_to_reconnect(opts) {
if (wait_time === undefined) { opts = _.extend({wait_time: 0}, opts);
wait_time = 0;
}
var that = this; var that = this;
var now = (new Date()).getTime(); var now = (new Date()).getTime();
@@ -317,7 +315,7 @@ Socket.prototype = {
blueslip.info("Attempting socket reconnect."); blueslip.info("Attempting socket reconnect.");
that._sockjs = new SockJS(that.url, null, {protocols_whitelist: that._supported_protocols}); that._sockjs = new SockJS(that.url, null, {protocols_whitelist: that._supported_protocols});
that._setup_sockjs_callbacks(that._sockjs); that._setup_sockjs_callbacks(that._sockjs);
}, wait_time); }, opts.wait_time);
}, },
_localstorage_requests: function Socket__localstorage_requests() { _localstorage_requests: function Socket__localstorage_requests() {