From fe4bd5fa72fbd36f4a0d1775774b8383701a38e2 Mon Sep 17 00:00:00 2001 From: Alvaro Vega Date: Tue, 22 Aug 2023 11:07:14 +0200 Subject: [PATCH] fix smtp log --- lib/models/emailAction.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/models/emailAction.js b/lib/models/emailAction.js index 8b377038..74bcf418 100644 --- a/lib/models/emailAction.js +++ b/lib/models/emailAction.js @@ -70,15 +70,20 @@ function SendMail(action, event, callback) { transporterOptions = buildTransporterOptions(action, event), opt2log, smtpConfig, - transporter; + transporter, + msgFromConfig; if (transporterOptions.smtp) { - logger.debug('Using smtp transporter config from action: %j', transporterOptions.smtp); smtpConfig = transporterOptions.smtp; + msgFromConfig = 'from action'; } else { - logger.debug('Using smtp transporter config: %j', config.smtp); smtpConfig = config.smtp; + msgFromConfig = 'from global'; } + var smtpAuth = smtpConfig.auth; + smtpConfig.auth = { user: 'UUU', pass: 'XXX' }; + logger.debug('Using smtp transporter %j config: %j', msgFromConfig, smtpConfig); + smtpConfig.auth = smtpAuth; transporter = nodemailer.createTransport(smtpTransport(smtpConfig)); metrics.IncMetrics(event.service, event.subservice, metrics.actionEmail); @@ -98,7 +103,7 @@ function SendMail(action, event, callback) { subject: mailOptions.subject, smtp: smtpConfig }; - opt2log.smtp.pass = 'XXX'; + opt2log.smtp.auth = { user: 'UUU', pass: 'XXX' }; myutils.logErrorIf(err, util.format('emailAction.SendMail %j', opt2log)); alarm.raise(alarm.EMAIL); } else {