nodemailer/wildduck
1
1
Fork 0
mirror of https://github.com/nodemailer/wildduck.git synced 2025-09-16 18:14:32 +08:00
Code Issues Projects Releases Packages Wiki Activity

Suppress ETIMEDOUT errors

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

6
imap-core/lib/imap-connection.js
View file

@ -265,14 +265,16 @@ class IMAPConnection extends EventEmitter {
if (err && /SSL23_GET_CLIENT_HELLO/.test(err.message)) { if (err && /SSL23_GET_CLIENT_HELLO/.test(err.message)) {
let message = 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 = { err.meta = {
protocol: 'imap',
stage: 'starttls',
message, message,
remoteAddress: this.remoteAddress remoteAddress: this.remoteAddress
}; };
} }
if (!err) { if (!err) {
err = new Error('Socket closed unexpectedly to ' + this.remoteAddress); err = new Error('Socket closed unexpectedly');
err.meta = { err.meta = {
remoteAddress: this.remoteAddress remoteAddress: this.remoteAddress
}; };

6
imap-core/lib/imap-server.js
View file

@ -198,14 +198,16 @@ class IMAPServer extends EventEmitter {
returned = true; returned = true;
if (err && /SSL23_GET_CLIENT_HELLO/.test(err.message)) { if (err && /SSL23_GET_CLIENT_HELLO/.test(err.message)) {
let message = 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 = { err.meta = {
protocol: 'imap',
stage: 'connect',
message, message,
remoteAddress remoteAddress
}; };
} }
if (!err) { if (!err) {
err = new Error('Socket closed unexpectedly to ' + remoteAddress); err = new Error('Socket closed unexpectedly');
err.meta = { err.meta = {
remoteAddress remoteAddress
}; };

6
lib/pop3/server.js
View file

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