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

Don't run older mail setup checks if "cluster.mailers" is configured

Browse source 
Summary: Ref T12677. Skip these checks if we're doing the new stuff. Also, allow priority to be unspecified.

Test Plan: Will deploy.

Maniphest Tasks: T12677

Differential Revision: https://secure.phabricator.com/D19043
This commit is contained in:
epriestley 2018-02-08 17:48:59 -08:00
parent 7d4362690f
commit 09b446b269
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/applications/config/check/PhabricatorMailSetupCheck.php
View file

@ -7,6 +7,10 @@ final class PhabricatorMailSetupCheck extends PhabricatorSetupCheck {
} }
protected function executeChecks() { protected function executeChecks() {
if (PhabricatorEnv::getEnvConfig('cluster.mailers')) {
return;
}
$adapter = PhabricatorEnv::getEnvConfig('metamta.mail-adapter'); $adapter = PhabricatorEnv::getEnvConfig('metamta.mail-adapter');
switch ($adapter) { switch ($adapter) {

4
src/infrastructure/cluster/config/PhabricatorClusterMailersConfigType.php
View file

@ -63,8 +63,8 @@ final class PhabricatorClusterMailersConfigType
} }
$map[$key] = true; $map[$key] = true;
$priority = idx($spec, 'priority', 0); $priority = idx($spec, 'priority');
if ($priority <= 0) { if ($priority !== null && $priority <= 0) {
throw $this->newException( throw $this->newException(
pht( pht(
'Mailer configuration ("%s") is invalid: priority must be '. 'Mailer configuration ("%s") is invalid: priority must be '.