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

Recover gracefully from Conduit failure when building "Tags" field in commit mail

Browse source 
Summary:
Ref T9458. This is basically the same as D13319, but the "Tags" field didn't get covered in that change.

Specifically, the issue is:

  - We try to generate mail to a disabled user (later, we'll drop it without delivering it, but that filtering doesn't happen yet).
  - The disabled user doesn't have permission to use Conduit (or any other Conduit-related problem occurs).
  - We fail here, then retry generating the mail again later.

Instead, just degrade to not building the field and showing what went wrong.

Test Plan:
  - Pushed some commits, saw mail generate.
  - Added a fake exception to the field, saw the mail generate with an error message.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T9458

Differential Revision: https://secure.phabricator.com/D14142
This commit is contained in:
epriestley 2015-09-22 13:03:29 -07:00
parent 799d86dc65
commit 8ded0927aa
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/applications/repository/customfield/PhabricatorCommitTagsField.php
View file

@ -29,18 +29,23 @@ final class PhabricatorCommitTagsField
'callsign' => $this->getObject()->getRepository()->getCallsign(),
);
$tags_raw = id(new ConduitCall('diffusion.tagsquery', $params))
->setUser($this->getViewer())
->execute();
try {
$tags_raw = id(new ConduitCall('diffusion.tagsquery', $params))
->setUser($this->getViewer())
->execute();
$tags = DiffusionRepositoryTag::newFromConduit($tags_raw);
if (!$tags) {
return;
$tags = DiffusionRepositoryTag::newFromConduit($tags_raw);
if (!$tags) {
return;
}
$tag_names = mpull($tags, 'getName');
sort($tag_names);
$tag_names = implode(', ', $tag_names);
} catch (Exception $ex) {
$tag_names = pht('<%s: %s>', get_class($ex), $ex->getMessage());
}
$tag_names = mpull($tags, 'getName');
sort($tag_names);
$body->addTextSection(pht('TAGS'), implode(', ', $tag_names));
$body->addTextSection(pht('TAGS'), $tag_names);
}
}