Skip to content

Commit

Permalink
fix(connect): listen to secureConnect for tls connections
Browse files Browse the repository at this point in the history
  • Loading branch information
mbroadst committed Jan 17, 2020
1 parent d13b153 commit f8bdb8d
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions lib/core/connection/connect.js
Expand Up @@ -281,6 +281,7 @@ function makeConnection(family, options, cancellationToken, _callback) {
socket.setTimeout(connectionTimeout);
socket.setNoDelay(noDelay);

const connectEvent = useSsl ? 'secureConnect' : 'connect';
let cancellationHandler;
function errorHandler(eventName) {
return err => {
Expand All @@ -289,7 +290,7 @@ function makeConnection(family, options, cancellationToken, _callback) {
cancellationToken.removeListener('cancel', cancellationHandler);
}

socket.removeListener('connect', connectHandler);
socket.removeListener(connectEvent, connectHandler);
callback(connectionFailureError(eventName, err));
};
}
Expand All @@ -314,7 +315,7 @@ function makeConnection(family, options, cancellationToken, _callback) {
cancellationToken.once('cancel', cancellationHandler);
}

socket.once('connect', connectHandler);
socket.once(connectEvent, connectHandler);
}

const CONNECTION_ERROR_EVENTS = ['error', 'close', 'timeout', 'parseError'];
Expand Down

0 comments on commit f8bdb8d

Please sign in to comment.