seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

* VRFS-594 - stop heartbeats in the right way - kill heartbeatInterval

This commit is contained in:
Seth Call 2013-09-01 02:24:47 +00:00
parent 45c0254c8d
commit a20f29bd1f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/JamServer.js
View File

@ -52,10 +52,9 @@
server.socket.onclose = server.onClose;
};
server.close = function(app, in_error) {
server.close = function(in_error) {
logger.log("closing websocket");
app.heartbeatActive = false; // stop future heartbeats
server.socket.close();
if(in_error) {

3
app/assets/javascripts/jamkazam.js
View File

@ -66,7 +66,8 @@
// this logic equates to 'if we have not received a heartbeat within 2 heartbeat intervals, then get upset
if(new Date().getTime() - lastHeartbeatAckTime.getTime() > heartbeatMS * 2) {
logger.error("no heartbeat ack received from server after twice heartbeat interval. giving up");
context.JK.JamServer.close(app, true);
clearInterval(heartbeatInterval); // stop future heartbeats
context.JK.JamServer.close(true);
}
}