fix(logs): send bounce information to remote log

zone-eu · Feb 9, 2024 · 3fd3986 · 3fd3986
1 parent ac0b692
commit 3fd3986
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 12 deletions.
diff --git a/config/default.js b/config/default.js
@@ -45,7 +45,10 @@ module.exports = {
         defaultZone: 'default',
 
         // remove messages from queue if not delivered or bounced before maxQueueTime
-        maxQueueTime: 30 * 24 * 3600 * 1000
+        maxQueueTime: 30 * 24 * 3600 * 1000,
+
+        // log every poll query from queue
+        logQueuePolling: false
     },
 
     // plugin files to load into ZoneMTA, relative to ./plugins folder

diff --git a/lib/mail-queue.js b/lib/mail-queue.js
@@ -433,11 +433,18 @@ class MailQueue {
                     returnOriginal: false
                 },
                 (err, item) => {
-                    plugins.handler.remotelog((item && item.value && item.value.id) || null, (item && item.value && item.value.seq) || false, 'QUEUE_POLL', {
-                        query,
-                        match: item && item.value ? true : false,
-                        error: err && err.message
-                    });
+                    if (this.options.logQueuePolling) {
+                        plugins.handler.remotelog(
+                            (item && item.value && item.value.id) || null,
+                            (item && item.value && item.value.seq) || false,
+                            'QUEUE_POLL',
+                            {
+                                query,
+                                match: item && item.value ? true : false,
+                                error: err && err.message
+                            }
+                        );
+                    }
 
                     if (err) {
                         return callback(err);

diff --git a/package-lock.json b/package-lock.json
diff --git a/plugins/core/email-bounce.js b/plugins/core/email-bounce.js
@@ -137,7 +137,19 @@ Status: ${isDelayed ? '4.0.0' : '5.0.0'}
             maildrop.add(envelope, mail.createReadStream(), err => {
                 if (err && err.name !== 'SMTPResponse') {
                     app.logger.error('Bounce', err.message);
+                    app.remotelog(bounce.id, bounce.seq, 'QUEUE_BOUNCE', {
+                        queued: 'no',
+                        bounceType: 'failure',
+                        error: err.message
+                    });
+                } else {
+                    app.remotelog(bounce.id, bounce.seq, 'QUEUE_BOUNCE', {
+                        queued: 'yes',
+                        bounceType: 'failure',
+                        bounceId: envelope.id
+                    });
                 }
+
                 next();
             });
         });
@@ -206,7 +218,19 @@ Status: ${isDelayed ? '4.0.0' : '5.0.0'}
             maildrop.add(envelope, mail.createReadStream(), err => {
                 if (err && err.name !== 'SMTPResponse') {
                     app.logger.error('Bounce', err.message);
+                    app.remotelog(bounce.id, bounce.seq, 'QUEUE_BOUNCE', {
+                        queued: 'no',
+                        bounceType: 'delayed',
+                        error: err.message
+                    });
+                } else {
+                    app.remotelog(bounce.id, bounce.seq, 'QUEUE_BOUNCE', {
+                        queued: 'yes',
+                        bounceType: 'delayed',
+                        bounceId: envelope.id
+                    });
                 }
+
                 resolve();
             });
         });