Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

socket: Clean up reconnection logic 

(imported from commit 3060803452bbb29417388cf612669785237f84f9)
This commit is contained in:
Zev Benjamin 2013-11-18 15:43:09 -05:00
parent 7870b4d158
commit 1562ba7439
1 changed files with 39 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
static/js/socket.js
View File

@ -2,6 +2,8 @@ function Socket(url) {
this.url = url; this.url = url;
this._is_open = false; this._is_open = false;
this._is_authenticated = false; this._is_authenticated = false;
this._is_reconnecting = false;
this._reconnect_initiation_time = null;
this._send_queue = []; this._send_queue = [];
this._next_req_id = 0; this._next_req_id = 0;
this._requests = {}; this._requests = {};
@ -28,10 +30,7 @@ Socket.prototype = {
send: function Socket_send(msg, success, error) { send: function Socket_send(msg, success, error) {
if (! this._can_send()) { if (! this._can_send()) {
this._send_queue.push({msg: msg, success: success, error: error}); this._send_queue.push({msg: msg, success: success, error: error});
if (this._reconnect_timeout_id !== null) { this._try_to_reconnect();
clearTimeout(this._reconnect_timeout_id);
}
this._do_reconnect();
return; return;
} }
@ -100,6 +99,8 @@ Socket.prototype = {
status_inquiries: _.keys(that._requests)}, status_inquiries: _.keys(that._requests)},
function (resp) { function (resp) {
that._is_authenticated = true; that._is_authenticated = true;
that._is_reconnecting = false;
that._reconnect_initiation_time = null;
that._connection_failures = 0; that._connection_failures = 0;
_.each(resp.status_inquiries, function (status, id) { _.each(resp.status_inquiries, function (status, id) {
if (status.status === 'complete') { if (status.status === 'complete') {
@ -114,7 +115,8 @@ Socket.prototype = {
}, },
function (type, resp) { function (type, resp) {
blueslip.info("Could not authenticate with server: " + resp.msg); blueslip.info("Could not authenticate with server: " + resp.msg);
that._try_to_reconnect(); that._connection_failures++;
that._try_to_reconnect(that._reconnect_wait_time());
}); });
}); });
}; };
@ -128,34 +130,49 @@ Socket.prototype = {
return; return;
} }
blueslip.info("SockJS connection lost. Attempting to reconnect soon."); blueslip.info("SockJS connection lost. Attempting to reconnect soon.");
that._try_to_reconnect(); that._connection_failures++;
that._is_reconnecting = false;
that._try_to_reconnect(that._reconnect_wait_time());
}; };
}, },
_do_reconnect: _.throttle(function Socket__do_reconnect() { _reconnect_wait_time: function Socket__reconnect_wait_time() {
blueslip.info("Attempting socket reconnect.");
this._sockjs = new SockJS(this.url, null, {protocols_whitelist: this._supported_protocols});
this._setup_sockjs_callbacks(this._sockjs);
}, 1000),
_try_to_reconnect: function Socket__try_to_reconnect() {
var that = this;
this._is_open = false;
this._is_authenticated = false;
this._connection_failures++;
var wait_time;
if (this._connection_failures === 1) { if (this._connection_failures === 1) {
// We specify a non-zero timeout here so that we don't try to // We specify a non-zero timeout here so that we don't try to
// immediately reconnect when the page is refreshing // immediately reconnect when the page is refreshing
wait_time = 30; return 30;
} else { } else {
wait_time = Math.min(90, Math.exp(this._connection_failures/2)) * 1000; return Math.min(90, Math.exp(this._connection_failures/2)) * 1000;
} }
},
_try_to_reconnect: function Socket__try_to_reconnect(wait_time) {
if (wait_time === undefined) {
wait_time = 0;
}
var that = this;
var now = (new Date()).getTime();
if (this._is_reconnecting && now - this._reconnect_initiation_time < 1000) {
// Only try to reconnect once a second
return;
}
if (this._reconnect_timeout_id !== null) {
clearTimeout(this._reconnect_timeout_id);
this._reconnect_timeout_id = null;
}
this._is_open = false;
this._is_authenticated = false;
this._is_reconnecting = true;
this._reconnect_initiation_time = now;
this._reconnect_timeout_id = setTimeout(function () { this._reconnect_timeout_id = setTimeout(function () {
that._reconnect_timeout_id = null; that._reconnect_timeout_id = null;
that._do_reconnect(); blueslip.info("Attempting socket reconnect.");
that._sockjs = new SockJS(that.url, null, {protocols_whitelist: that._supported_protocols});
that._setup_sockjs_callbacks(that._sockjs);
}, wait_time); }, wait_time);
} }
}; };