Skip to content

Log queue_id earlier

dlucredativ requested to merge log_queue_id into master

It is possible that amavis is shut down between forwarding a message and logging the main_log_entry. In such case it is not possible to correlate different steps of a mail flow.

Logging the queue_id as part of the Checking: line works for SMTP as well as AM.PDP.

When there is no queue_id:

(00011-02) Checking: srXIA2NUZMSJ [172.80.7.1] <sender@example.com> -> <recip@example.com>

When a queue_id has been passed to Amavis (either via XFORWARD or via AM.PDP):

(00010-04) Checking: 8vo30Hpbpu2P [172.80.7.1] <sender@example.com> -> <recip@example.com> queue_id=0123456789
Edited by dlucredativ

Merge request reports