Merge branch 'master' of kreata.ee:/var/opt/mailtrain

This commit is contained in:
Andris Reinman 2017-03-23 15:47:56 +02:00
commit 060b6dbacc

View file

@ -43,7 +43,7 @@ let server = net.createServer(socket => {
} }
campaigns.updateMessage(message, 'bounced', true, (err, updated) => { campaigns.updateMessage(message, 'bounced', true, (err, updated) => {
if (err) { if (err) {
log.error('POSTFIXBOUNCE', 'Failed updating message: %s', err.stack); log.error('POSTFIXBOUNCE', 'Failed updating message: %s', err && err.stack);
} else if (updated) { } else if (updated) {
log.verbose('POSTFIXBOUNCE', 'Marked message %s as bounced', queueId); log.verbose('POSTFIXBOUNCE', 'Marked message %s as bounced', queueId);
} }
@ -71,7 +71,7 @@ let server = net.createServer(socket => {
}); });
server.on('error', err => { server.on('error', err => {
log.error('POSTFIXBOUNCE', err.stack); log.error('POSTFIXBOUNCE', err && err.stack);
}); });
module.exports = callback => { module.exports = callback => {