Page MenuHomePhabricator
Files F14005702

D19007.id.diff
No OneTemporary
Actions

D19007.id.diff
View Options

diff --git a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
--- a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
+++ b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
@@ -315,6 +315,10 @@
return $this->getParam('stampMetadata', array());
}
+ public function getMailerKey() {
+ return $this->getParam('mailer.key');
+ }
+
public function setHTMLBody($html) {
$this->setParam('html-body', $html);
return $this;
@@ -588,6 +592,12 @@
continue;
}
+ // Keep track of which mailer actually ended up accepting the message.
+ $mailer_key = $mailer->getKey();
+ if ($mailer_key !== null) {
+ $this->setParam('mailer.key', $mailer_key);
+ }
+
return $this
->setStatus(PhabricatorMailOutboundStatus::STATUS_SENT)
->save();
@@ -919,12 +929,6 @@
$mailer->addCCs($add_cc);
}
- // Keep track of which mailer actually ended up accepting the message.
- $mailer_key = $mailer->getKey();
- if ($mailer_key !== null) {
- $this->setParam('mailer.key', $mailer_key);
- }
-
return $mailer;
}
diff --git a/src/applications/metamta/storage/__tests__/PhabricatorMetaMTAMailTestCase.php b/src/applications/metamta/storage/__tests__/PhabricatorMetaMTAMailTestCase.php
--- a/src/applications/metamta/storage/__tests__/PhabricatorMetaMTAMailTestCase.php
+++ b/src/applications/metamta/storage/__tests__/PhabricatorMetaMTAMailTestCase.php
@@ -253,4 +253,82 @@
->executeOne();
}
+ public function testMailerFailover() {
+ $user = $this->generateNewTestUser();
+ $phid = $user->getPHID();
+
+ $status_sent = PhabricatorMailOutboundStatus::STATUS_SENT;
+ $status_queue = PhabricatorMailOutboundStatus::STATUS_QUEUE;
+ $status_fail = PhabricatorMailOutboundStatus::STATUS_FAIL;
+
+ $mailer1 = id(new PhabricatorMailImplementationTestAdapter())
+ ->setKey('mailer1');
+
+ $mailer2 = id(new PhabricatorMailImplementationTestAdapter())
+ ->setKey('mailer2');
+
+ $mailers = array(
+ $mailer1,
+ $mailer2,
+ );
+
+ // Send mail with both mailers active. The first mailer should be used.
+ $mail = id(new PhabricatorMetaMTAMail())
+ ->addTos(array($phid))
+ ->sendWithMailers($mailers);
+ $this->assertEqual($status_sent, $mail->getStatus());
+ $this->assertEqual('mailer1', $mail->getMailerKey());
+
+
+ // If the first mailer fails, the mail should be sent with the second
+ // mailer. Since we transmitted the mail, this doesn't raise an exception.
+ $mailer1->setFailTemporarily(true);
+
+ $mail = id(new PhabricatorMetaMTAMail())
+ ->addTos(array($phid))
+ ->sendWithMailers($mailers);
+ $this->assertEqual($status_sent, $mail->getStatus());
+ $this->assertEqual('mailer2', $mail->getMailerKey());
+
+
+ // If both mailers fail, the mail should remain in queue.
+ $mailer2->setFailTemporarily(true);
+
+ $mail = id(new PhabricatorMetaMTAMail())
+ ->addTos(array($phid));
+
+ $caught = null;
+ try {
+ $mail->sendWithMailers($mailers);
+ } catch (Exception $ex) {
+ $caught = $ex;
+ }
+
+ $this->assertTrue($caught instanceof Exception);
+ $this->assertEqual($status_queue, $mail->getStatus());
+ $this->assertEqual(null, $mail->getMailerKey());
+
+ $mailer1->setFailTemporarily(false);
+ $mailer2->setFailTemporarily(false);
+
+
+ // If the first mailer fails permanently, the mail should fail even though
+ // the second mailer isn't configured to fail.
+ $mailer1->setFailPermanently(true);
+
+ $mail = id(new PhabricatorMetaMTAMail())
+ ->addTos(array($phid));
+
+ $caught = null;
+ try {
+ $mail->sendWithMailers($mailers);
+ } catch (Exception $ex) {
+ $caught = $ex;
+ }
+
+ $this->assertTrue($caught instanceof Exception);
+ $this->assertEqual($status_fail, $mail->getStatus());
+ $this->assertEqual(null, $mail->getMailerKey());
+ }
+
}

File Metadata

Mime Type
text/plain
Expires
Mon, Oct 28, 6:02 PM (2 w, 5 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6735135
Default Alt Text
D19007.id.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility