Suppress ETIMEDOUT errors

This commit is contained in:
Andris Reinman 2017-10-07 23:19:00 +03:00
parent b688bbb067
commit 1fca2d024f
2 changed files with 8 additions and 4 deletions

View file

@ -221,7 +221,8 @@ class IMAPServer extends EventEmitter {
// upgrade connection
let tlsSocket = new tls.TLSSocket(socket, socketOptions);
tlsSocket.once('close', onError);
let onCloseError = () => onError(new Error('Socket closed while initiating TLS'));
tlsSocket.once('close', onCloseError);
tlsSocket.once('error', onError);
tlsSocket.once('_tlsError', onError);
tlsSocket.once('clientError', onError);
@ -229,7 +230,7 @@ class IMAPServer extends EventEmitter {
tlsSocket.on('secure', () => {
socket.removeListener('error', onError);
tlsSocket.removeListener('close', onError);
tlsSocket.removeListener('close', onCloseError);
tlsSocket.removeListener('error', onError);
tlsSocket.removeListener('_tlsError', onError);
tlsSocket.removeListener('clientError', onError);

View file

@ -76,6 +76,8 @@ class POP3Server extends EventEmitter {
let message = err.message;
err.message = 'Failed to establish TLS session on connection';
err.meta = {
protocol: 'pop3',
stage: 'connect',
message,
remoteAddress
};
@ -95,7 +97,8 @@ class POP3Server extends EventEmitter {
// upgrade connection
let tlsSocket = new tls.TLSSocket(socket, socketOptions);
tlsSocket.once('close', onError);
let onCloseError = () => onError(new Error('Socket closed while initiating TLS'));
tlsSocket.once('close', onCloseError);
tlsSocket.once('error', onError);
tlsSocket.once('_tlsError', onError);
tlsSocket.once('clientError', onError);
@ -103,7 +106,7 @@ class POP3Server extends EventEmitter {
tlsSocket.on('secure', () => {
socket.removeListener('error', onError);
tlsSocket.removeListener('close', onError);
tlsSocket.removeListener('close', onCloseError);
tlsSocket.removeListener('error', onError);
tlsSocket.removeListener('_tlsError', onError);
tlsSocket.removeListener('clientError', onError);