revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-30 02:32:42 +01:00
Code Issues Releases Wiki Activity

Add some delivery diagnostic headers to outbound mail

Browse source 
Summary:
Fixes T13087. Ref T13090. An install ran into a situation where mail was being double-delivered, and it wasn't immediately clear where in the pipeline the issue lay.

This change adds some headers which should rule out (or, at least, render very unlikely) some possible causes if we encounter similar issues in the future.

The `X-Phabricator-Mail-ID` header stores the ID of the `MetaMTAMail` storage object so we can distinguish between two messages sent to two different targets and one message which may have been split or re-sent. It also makes it easier to know what to `bin/mail show-outbound --id <id>` and where to find the message in the web UI for additional information.

The `X-Phabricator-Send-Attempt` is a unique value per attempt. If two mail messages are delivered with the same attempt value, the split is probably downstream from Phabricator. If they have different attempt values, the split is probably in Phabricator.

(In this case, the split was somewhere downstream from us, since sending mail with `/usr/bin/mail` also resulted in duplicates.)

Test Plan: Send some mail, inspected it with `bin/mail show-outbound --id <id>`, saw new headers with sensible/expected values.

Maniphest Tasks: T13090, T13087

Differential Revision: https://secure.phabricator.com/D19124
This commit is contained in:
epriestley 2018-02-22 10:09:49 -08:00
parent 2085716da6
commit ffcfc04652
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/applications/metamta/storage/PhabricatorMetaMTAMail.php
View file

@ -1302,6 +1302,11 @@ final class PhabricatorMetaMTAMail
$headers[] = array('Thread-Topic', $related_phid); $headers[] = array('Thread-Topic', $related_phid);
} }
$headers[] = array('X-Phabricator-Mail-ID', $this->getID());
$unique = Filesystem::readRandomCharacters(16);
$headers[] = array('X-Phabricator-Send-Attempt', $unique);
return $headers; return $headers;
} }
@ -1356,6 +1361,8 @@ final class PhabricatorMetaMTAMail
'X-Phabricator-Sent-This-Message', 'X-Phabricator-Sent-This-Message',
'X-Phabricator-Must-Encrypt', 'X-Phabricator-Must-Encrypt',
'X-Phabricator-Mail-ID',
'X-Phabricator-Send-Attempt',
); );
// NOTE: The major header we want to drop is "X-Phabricator-Mail-Tags". // NOTE: The major header we want to drop is "X-Phabricator-Mail-Tags".