github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup socket a little more aggressively. Hopefully fixes hanging connection bug.

Browse Source
This commit is contained in:
Nick Martin
2012-01-09 14:42:42 -08:00
parent 58822077f4
commit a9f58deb93
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/stream/stream_client.js
View File

@@ -107,13 +107,18 @@ if (typeof Sky === "undefined") Sky = {};
}
retry_later(); // sets status. no need to do it here.
};
var cleanup_socket = function () {
if (socket) {
socket.removeAllListeners('connect');
socket.removeAllListeners('disconnect');
socket.removeAllListeners('connect_failed');
socket.disconnect();
}
};
var fake_connect_failed = function () {
// sometimes socket.io just doesn't tell us when it failed. we
// detect this with a timer and force failure.
socket.removeAllListeners('connect');
socket.removeAllListeners('disconnect');
socket.removeAllListeners('connect_failed');
socket.disconnect();
cleanup_socket();
disconnected();
};
@@ -147,7 +152,7 @@ if (typeof Sky === "undefined") Sky = {};
};
var launch_connection = function () {
// XXX if existing socket, any cleanup we have to do?
cleanup_socket(); // cleanup the old socket.
socket = io.connect('/', { reconnect: false,
'connect timeout': CONNECT_TIMEOUT,