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

Merge pull request #305 from theyough/master

Browse source 
Fix when postfix server does not send 'queue as' properly
This commit is contained in:
Andris Reinman 2017-09-06 13:01:59 +03:00 committed by GitHub
commit 6aec53d882
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
services/postfix-bounce-server.js
View file

@ -48,7 +48,11 @@ let server = net.createServer(socket => {
if ( queued ) { if ( queued ) {
queued = queued[1]; queued = queued[1];
queued_as = queued.match(/ queued as (\w+)/); queued_as = queued.match(/ queued as (\w+)/);
queued_as = queued_as[1]; if (queued_as) {
queued_as = queued_as[1];
} else {
queued_as = '';
}
} }
} }
@ -56,7 +60,7 @@ let server = net.createServer(socket => {
if (err || !message) { if (err || !message) {
return checkNextLine(); return checkNextLine();
} }
if ( queued_as ) { if ( queued_as || status === 'sent' ) {
log.verbose('POSTFIXBOUNCE', 'Message %s locally requeued as %s', queueId, queued_as); log.verbose('POSTFIXBOUNCE', 'Message %s locally requeued as %s', queueId, queued_as);
// Update message's previous queueId (thanks @mfechner ) // Update message's previous queueId (thanks @mfechner )
campaigns.updateMessageResponse(message, queued, queued_as, (err, updated) => { campaigns.updateMessageResponse(message, queued, queued_as, (err, updated) => {