Merge pull request #324 from deepstreamIO/fix/closed-not-error

heartbeat missed should close connection
deepstreamIO · Feb 19, 2017 · 0021b96 · 0021b96
2 parents f091f1d + e2c1b38
commit 0021b96
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/message/connection.js b/src/message/connection.js
@@ -260,8 +260,11 @@ Connection.prototype._checkHeartBeat = function() {
 
 	if( Date.now() - this._lastHeartBeat > heartBeatTolerance ) {
 		clearInterval( this._heartbeatInterval );
+		this._client._$onError(
+			C.TOPIC.CONNECTION,
+			C.EVENT.CONNECTION_ERROR,
+			'heartbeat not received in the last ' + heartBeatTolerance + ' milliseconds' );
 		this._endpoint.close();
-		this._onError( 'Two connections heartbeats missed successively' );
 	}
 };
 

diff --git a/test-unit/unit/message/connectionSpec.js b/test-unit/unit/message/connectionSpec.js
@@ -113,8 +113,8 @@ describe('connects - heartbeats', function(){
 	it( 'when it misses two heart beats it closes connection', function( done ){
 		setTimeout( function() {
 			expect( connection._endpoint.lastSendMessage ).toBe( null );
-			expect( connection.getState() ).toBe( 'ERROR' );
-			expect( clientMock.lastError ).toEqual( [ 'C', 'connectionError', 'Two connections heartbeats missed successively' ] );
+			expect( connection.getState() ).toBe( 'CLOSED' );
+			expect( clientMock.lastError ).toEqual( [ 'C', 'connectionError', 'heartbeat not received in the last 100 milliseconds' ] );
 			done();
 		}, 200 );
 	});