archive/phabricator
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #73 from mareksapota-fb/master

Browse Source 
Pull request for differential revision D1021
This commit is contained in:
Evan Priestley
2011-10-19 14:57:15 -07:00
parent b896341572 5148741ab2
commit dfa2e29a01
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/applications/metamta/storage/mail/PhabricatorMetaMTAMail.php
View File

@@ -178,10 +178,12 @@ class PhabricatorMetaMTAMail extends PhabricatorMetaMTADAO {
* @return this
*/
public function saveAndSend() {
$ret = $this->save();
$ret = null;
if (PhabricatorEnv::getEnvConfig('metamta.send-immediately')) {
$this->sendNow();
$ret = $this->sendNow();
} else {
$ret = $this->save();
}
return $ret;
@@ -343,8 +345,7 @@ class PhabricatorMetaMTAMail extends PhabricatorMetaMTADAO {
} catch (Exception $ex) {
$this->setStatus(self::STATUS_FAIL);
$this->setMessage($ex->getMessage());
$this->save();
return;
return $this->save();
}
if ($this->getRetryCount() < $this->getSimulatedFailureCount()) {
@@ -373,7 +374,7 @@ class PhabricatorMetaMTAMail extends PhabricatorMetaMTADAO {
$this->setStatus(self::STATUS_SENT);
}
$this->save();
return $this->save();
}
public static function getReadableStatus($status_code) {