From 7b238f7382011f509129f27ab75d1bf8a13f251c Mon Sep 17 00:00:00 2001 From: Stoiko Ivanov Date: Mon, 25 May 2020 19:04:09 +0200 Subject: [PATCH] MailTracker - remove special case for before-queue Since we've recently added dedicated before-queue status to pmg-log-tracker the MailTracker should treat before and after queue filtered mail equally. This patch drops the note stating otherwise. Additionally the line with 'queued/delivered' was left in place, since the status does exist (as with the other 'queued' status mails it happens for internally generated mails). This commit partially reverts 6abb9ee31568c3828ab83fa8ec264d90fffe7dd1 Signed-off-by: Stoiko Ivanov --- pmg-administration.adoc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pmg-administration.adoc b/pmg-administration.adoc index 3f6be64..18650b1 100644 --- a/pmg-administration.adoc +++ b/pmg-administration.adoc @@ -155,10 +155,6 @@ In the second phase, accepted mails need to be delivered to the receiver. This action may also fail or succeed. 'Status' combines the result from the first and second phase. -When before-queue filtering is enabled, we don't have the same delivery information as -with after-queue filtering. In this case, if the mail is accepted by the filter, -the status is shown as 'queued/accepted' instead of 'accepted/'. - [options="header",cols="2s,1d,5d"] |==== |Status |Phase |Description @@ -166,7 +162,7 @@ the status is shown as 'queued/accepted' instead of 'accepted/'. |greylisted |1 | Email temporarily rejected by greylisting |queued/deferred |1 | Internal Email was queued, still trying to deliver |queued/bounced |1 | Internal Email was queued but not accepted by the target email server (for example user unknown) -|queued/accepted |1 | Email was accepted, no delivery information available (before-queue only, replaces accepted/) +|queued/delivered |1 | Internal Email was queued and delivered |quarantine |1 | Email was moved to quarantine |blocked |1 | Email was blocked by filter rules |accepted/deferred |2 | Email accepted, still trying to deliver