Skip to content

Commit 9858f32

Browse files
committed
improve logging, bump deps
1 parent 6d6b0d0 commit 9858f32

File tree

4 files changed

+99
-102
lines changed

4 files changed

+99
-102
lines changed

.eslintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
},
88
"extends": ["nodemailer", "prettier"],
99
"parserOptions": {
10-
"ecmaVersion": 2018
10+
"ecmaVersion": 2020
1111
}
1212
}

lib/smtp-interface.js

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,20 @@ class SMTPInterface {
289289
return setImmediate(() => callback(err));
290290
}
291291

292+
let hostname = '[' + session.remoteAddress + ']';
293+
if (session.clientHostname && session.clientHostname.charAt(0) !== '[') {
294+
hostname = session.clientHostname + hostname;
295+
}
296+
297+
log.info(
298+
this.logName,
299+
'CONNECTION id=%s src=%s:%s tlsProtocol=%s',
300+
session.id,
301+
hostname,
302+
session.remotePort,
303+
session?.tlsOptions?.version || 'No TLS'
304+
);
305+
292306
plugins.handler.runHooks('smtp:connect', [session], err => {
293307
if (err) {
294308
return setImmediate(() => callback(err));
@@ -351,16 +365,8 @@ class SMTPInterface {
351365

352366
this.server = new SMTPServer(serverConfig);
353367

354-
this.server.on('connect', data => {
355-
let hostname = '[' + data.remoteAddress + ']';
356-
if (data.clientHostname && data.clientHostname.charAt(0) !== '[') {
357-
hostname = data.clientHostname + hostname;
358-
}
359-
log.info(this.logName, 'CONNECTION id=%s src=%s:%s', data.id, hostname, data.remotePort);
360-
});
361-
362368
this.server.on('error', err => {
363-
log.error(this.logName, 'SERVERR error=%s', err.message);
369+
log.error(this.logName, 'SERVERR error=%s debug=%s', err.message, JSON.stringify(err));
364370
});
365371

366372
plugins.handler.runHooks('smtp:init', [this], () => callback());

0 commit comments

Comments
 (0)