[pmg-devel] applied: [PATCH pmg-docs] clarify tracking center docs for before-queue

[Thomas Lamprecht]

On 4/16/20 5:40 PM, Mira Limbeck wrote:
> In the after-queue case we get 2 QEntrys from the pmg-log-tracker when
> the mail is accepted. One serves as a relay and provides the delivery
> status. In the before-queue case we only have 1 QEntry and no extra delivery
> status. This results in before-queue accepted mails being shown as
> 'queued/accepted' instead of 'accepted/<status>'.
> 
> As the tracking center shows 'queued/accepted', mention this combination
> in the docs and clarify that it only happens in the before-queue
> filtering case.
> 
> Signed-off-by: Mira Limbeck <m.limbeck at proxmox.com>
> ---
>  pmg-administration.adoc | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/pmg-administration.adoc b/pmg-administration.adoc
> index cc517b8..79e66e5 100644
> --- a/pmg-administration.adoc
> +++ b/pmg-administration.adoc
> @@ -151,7 +151,11 @@ rules can block or accept the mail.
>  
>  In the second phase, accepted mails need to be delivered to the
>  receiver, and this action may also fail or succeed. The status
> -combines the result from the first and second phase:
> +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/<status>'.
>  
>  [options="header",cols="2s,1d,5d"]
>  |====
> @@ -160,11 +164,12 @@ combines the result from the first and second phase:
>  |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 (e. g. user unknown)
> +|queued/accepted      |1 | Email was accepted, no delivery information available (before-queue only, replaces accepted/<status>)
>  |quarantine           |1 | Email was moved to quanantine
>  |blocked              |1 | Email was blocked by filter rules
>  |accepted/deferred    |2 | Email accepted, still trying to deliver
>  |accepted/bounced     |2 | Email accepted but not accepted by the target email server (e. g. user unknown)
> -|accepted/delivered   |2 | Email accepted and deliverd
> +|accepted/delivered   |2 | Email accepted and delivered
>  |====
>  
>  
> 

applied, thanks!