Page MenuHomePhabricator
Files F14091139

D7965.id18016.diff
No OneTemporary
Actions

D7965.id18016.diff
View Options

Index: conf/default.conf.php
===================================================================
--- conf/default.conf.php
+++ conf/default.conf.php
@@ -299,13 +299,6 @@
'metamta.mail-adapter' =>
'PhabricatorMailImplementationPHPMailerLiteAdapter',
- // When email is sent, try to hand it off to the MTA immediately instead of
- // queueing it for delivery by the daemons. If you are running the Phabricator
- // daemons with "phd start", you should disable this to provide a (sometimes
- // substantial) performance boost. It's on by default to make setup and
- // configuration a little easier.
- 'metamta.send-immediately' => true,
-
// When email is sent, what format should Phabricator use for user's
// email addresses? Valid values are:
// - 'short' - 'gwashington <gwashington@example.com>'
Index: src/applications/config/check/PhabricatorSetupCheckExtraConfig.php
===================================================================
--- src/applications/config/check/PhabricatorSetupCheckExtraConfig.php
+++ src/applications/config/check/PhabricatorSetupCheckExtraConfig.php
@@ -170,6 +170,8 @@
'celerity.resource-path' => pht(
'An alternate resource map is no longer supported. Instead, use '.
'multiple maps. See T4222.'),
+ 'metamta.send-immediately' => pht(
+ 'Mail is now always delivered by the daemons.'),
);
return $ancient_config;
Index: src/applications/config/option/PhabricatorMetaMTAConfigOptions.php
===================================================================
--- src/applications/config/option/PhabricatorMetaMTAConfigOptions.php
+++ src/applications/config/option/PhabricatorMetaMTAConfigOptions.php
@@ -138,15 +138,6 @@
EODOC
));
- $immediately_description = $this->deformat(pht(<<<EODOC
-When email is sent, try to hand it off to the MTA immediately instead of
-queueing it for delivery by the daemons. If you are running the Phabricator
-daemons with "phd start", you should disable this to provide a (sometimes
-substantial) performance boost. It's on by default to make setup and
-configuration a little easier.
-EODOC
-));
-
$placeholder_description = $this->deformat(pht(<<<EODOC
When sending a message that has no To recipient (i.e. all recipients are CC'd,
for example when multiplexing mail), set the To field to the following value. If
@@ -298,14 +289,6 @@
))
->setSummary(pht('Trust "Reply-To" headers for authentication.'))
->setDescription($reply_to_description),
- $this->newOption('metamta.send-immediately', 'bool', true)
- ->setBoolOptions(
- array(
- pht('Send Immediately (Slow)'),
- pht('Send Via Daemons (Must Run Daemons)'),
- ))
- ->setSummary(pht('Improve performance by sending email via daemons.'))
- ->setDescription($immediately_description),
$this->newOption('metamta.placeholder-to-recipient', 'string', null)
->setSummary(pht('Placeholder for mail with only CCs.'))
->setDescription($placeholder_description),
Index: src/applications/metamta/storage/PhabricatorMetaMTAMail.php
===================================================================
--- src/applications/metamta/storage/PhabricatorMetaMTAMail.php
+++ src/applications/metamta/storage/PhabricatorMetaMTAMail.php
@@ -289,25 +289,13 @@
}
/**
- * Save a newly created mail to the database and attempt to send it
- * immediately if the server is configured for immediate sends. When
- * applications generate new mail they should generally use this method to
- * deliver it. If the server doesn't use immediate sends, this has the same
- * effect as calling save(): the mail will eventually be delivered by the
- * MetaMTA daemon.
+ * Save a newly created mail to the database. The mail will eventually be
+ * delivered by the MetaMTA daemon.
*
* @return this
*/
public function saveAndSend() {
- $ret = null;
-
- if (PhabricatorEnv::getEnvConfig('metamta.send-immediately')) {
- $ret = $this->sendNow();
- } else {
- $ret = $this->save();
- }
-
- return $ret;
+ return $this->save();
}
protected function didWriteData() {
Index: src/docs/user/configuration/configuring_outbound_email.diviner
===================================================================
--- src/docs/user/configuration/configuring_outbound_email.diviner
+++ src/docs/user/configuration/configuring_outbound_email.diviner
@@ -152,17 +152,6 @@
it yet. Just set **metamta.mail-adapter** to
"PhabricatorMailImplementationTestAdapter".
-= Configuring MetaMTA to Send Mail Using a Daemon =
-
-Regardless of how you are sending outbound email, you can move the handoff to
-the MTA out of the main process and into a daemon. This will greatly improve
-application performance if your mailer is slow, like Amazon SES. In particular,
-commenting on Differential Revisions and Maniphest Tasks sends outbound email.
-
-If you set **metamta.send-immediately** to ##false## in your configuration,
-MetaMTA will queue mail to be send by a PhabricatorTaskmasterDaemon.
-For more information on using daemons, see @{article:Managing Daemons with phd}.
-
= Testing and Debugging Outbound Email =
You can use the `bin/mail` utility to test, debug, and examine outbound mail. In

File Metadata

Mime Type
text/plain
Expires
Mon, Nov 25, 10:27 PM (6 h, 53 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6787185
Default Alt Text
D7965.id18016.diff (5 KB)

Event Timeline

Phabricator · Built by Phacility