public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed throttling and pausing #243

Browse source
This commit is contained in:
witzig 2017-06-01 13:08:45 +02:00
parent a7b2c33b30
commit cff908887f
3 changed files with 117 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

25
lib/mailer.js
View file

@ -182,10 +182,10 @@ function createMailer(callback) {
module.exports.transport.checkThrottling = null;
}
let throttling = Number(configItems.smtpThrottling) || 0;
if (throttling) {
let sendingRate = Number(configItems.smtpThrottling) || 0;
if (sendingRate) {
// convert to messages/second
throttling = 1 / (throttling / (3600 * 1000));
sendingRate = sendingRate / 3600;
}
let transportOptions;
@ -236,7 +236,7 @@ function createMailer(callback) {
error: logfunc.bind(null, 'error')
},
maxConnections: Number(configItems.smtpMaxConnections),
sendingRate: throttling,
sendingRate,
tls: {
rejectUnauthorized: !configItems.smtpSelfSigned
}
@ -257,19 +257,30 @@ function createMailer(callback) {
oldListeners.forEach(listener => module.exports.transport.on('idle', listener));
}
let lastCheck = Date.now();
if (configItems.mailTransport === 'smtp' || !configItems.mailTransport) {
let throttling = Number(configItems.smtpThrottling) || 0;
if (throttling) {
throttling = 1 / (throttling / (3600 * 1000));
}
let lastCheck = Date.now();
module.exports.transport.checkThrottling = function (next) {
if (!throttling) {
return next();
}
let nextCheck = Date.now();
let checkDiff = (nextCheck - lastCheck);
lastCheck = nextCheck;
if (checkDiff < throttling) {
log.verbose('Mail', 'Throttling next message in %s sec.', (throttling - checkDiff) / 1000);
setTimeout(next, throttling - checkDiff);
setTimeout(() => {
lastCheck = Date.now();
next();
}, throttling - checkDiff);
} else {
lastCheck = nextCheck;
next();
}
};