revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2025-04-03 16:08:19 +02:00
Code Issues Releases Wiki Activity

Prevent duplicated emails with send-immedialtely = true and MTA daemon running

Browse source 
Test Plan:
Set 'metamta.send-immediately' to true.  Start up several MTA daemons, without
the patch you'll probably get multiple emails, with the patch you should get
only one.

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, mareksapota, epriestley

Differential Revision: 1021
This commit is contained in:
Marek Sapota 2011-10-19 12:54:49 -07:00
parent b896341572
commit 5148741ab2
1 changed files with 6 additions and 5 deletions
Show stats 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 * @return this
*/ */
public function saveAndSend() { public function saveAndSend() {
$ret = $this->save(); $ret = null;
if (PhabricatorEnv::getEnvConfig('metamta.send-immediately')) { if (PhabricatorEnv::getEnvConfig('metamta.send-immediately')) {
$this->sendNow(); $ret = $this->sendNow();
} else {
$ret = $this->save();
} }
return $ret; return $ret;
@ -343,8 +345,7 @@ class PhabricatorMetaMTAMail extends PhabricatorMetaMTADAO {
} catch (Exception $ex) { } catch (Exception $ex) {
$this->setStatus(self::STATUS_FAIL); $this->setStatus(self::STATUS_FAIL);
$this->setMessage($ex->getMessage()); $this->setMessage($ex->getMessage());
$this->save(); return $this->save();
return;
} }
if ($this->getRetryCount() < $this->getSimulatedFailureCount()) { if ($this->getRetryCount() < $this->getSimulatedFailureCount()) {
@ -373,7 +374,7 @@ class PhabricatorMetaMTAMail extends PhabricatorMetaMTADAO {
$this->setStatus(self::STATUS_SENT); $this->setStatus(self::STATUS_SENT);
} }
$this->save(); return $this->save();
} }
public static function getReadableStatus($status_code) { public static function getReadableStatus($status_code) {