Suppress ETIMEDOUT errors

This commit is contained in:
Andris Reinman 2017-10-07 23:11:02 +03:00
parent 670fd379e3
commit b688bbb067
3 changed files with 11 additions and 7 deletions

View file

@ -265,14 +265,16 @@ class IMAPConnection extends EventEmitter {
if (err && /SSL23_GET_CLIENT_HELLO/.test(err.message)) {
let message = err.message;
err.message = 'Failed to establish TLS session to ' + this.remoteAddress;
err.message = 'Failed to establish TLS session';
err.meta = {
protocol: 'imap',
stage: 'starttls',
message,
remoteAddress: this.remoteAddress
};
}
if (!err) {
err = new Error('Socket closed unexpectedly to ' + this.remoteAddress);
err = new Error('Socket closed unexpectedly');
err.meta = {
remoteAddress: this.remoteAddress
};

View file

@ -198,14 +198,16 @@ class IMAPServer extends EventEmitter {
returned = true;
if (err && /SSL23_GET_CLIENT_HELLO/.test(err.message)) {
let message = err.message;
err.message = 'Failed to establish TLS session on connection to ' + remoteAddress;
err.message = 'Failed to establish TLS session';
err.meta = {
protocol: 'imap',
stage: 'connect',
message,
remoteAddress
};
}
if (!err) {
err = new Error('Socket closed unexpectedly to ' + remoteAddress);
err = new Error('Socket closed unexpectedly');
err.meta = {
remoteAddress
};

View file

@ -74,19 +74,19 @@ class POP3Server extends EventEmitter {
returned = true;
if (err && /SSL23_GET_CLIENT_HELLO/.test(err.message)) {
let message = err.message;
err.message = 'Failed to establish TLS session on connection to ' + remoteAddress;
err.message = 'Failed to establish TLS session on connection';
err.meta = {
message,
remoteAddress
};
}
if (!err) {
err = new Error('Socket closed unexpectedly to ' + remoteAddress);
err = new Error('Socket closed unexpectedly');
err.meta = {
remoteAddress
};
}
callback(err || new Error('Socket closed unexpectedly'));
callback(err);
};
// remove all listeners from the original socket besides the error handler