Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-09 07:25:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: #9339, only log email errors once per digest, notification push

Browse Source 
show notice in acp
This commit is contained in:
Barış Soner Uşaklı
2021-03-05 19:03:16 -05:00
parent 3f42d40c78
commit 3aa26c4df2
6 changed files with 35 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/emailer.js
View File

@@ -25,6 +25,8 @@ const Emailer = module.exports;
let prevConfig;
let app;
Emailer.fallbackNotFound = false;
Emailer.transports = {
sendmail: nodemailer.createTransport({
sendmail: true,
@@ -312,7 +314,8 @@ Emailer.sendToEmail = async (template, email, language, params) => {
headers: params.headers,
rtl: params.rtl,
});
const usingFallback = !Plugins.hooks.hasListeners('filter:email.send') &&
!Plugins.hooks.hasListeners('static:email.send');
try {
if (Plugins.hooks.hasListeners('filter:email.send')) {
// Deprecated, remove in v1.18.0
@@ -323,7 +326,8 @@ Emailer.sendToEmail = async (template, email, language, params) => {
await Emailer.sendViaFallback(data);
}
} catch (err) {
if (err && err.code === 'ENOENT') {
if (err.code === 'ENOENT' && usingFallback) {
Emailer.fallbackNotFound = true;
throw new Error('[[error:sendmail-not-found]]');
} else {
throw err;