Skip to content

[stable10] Use SwiftMailer antiflood plugin to reconnect after multiple emails sent #28180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PVince81 merged 1 commit into from
Jun 23, 2017
Merged

[stable10] Use SwiftMailer antiflood plugin to reconnect after multiple emails sent #28180

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 16 additions & 9 deletions lib/private/Mail/Mailer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,6 @@ public function send(Message $message) {

$mailer = $this->getInstance();

// Enable logger if debug mode is enabled
if($debugMode) {
$mailLogger = new \Swift_Plugins_Loggers_ArrayLogger();
$mailer->registerPlugin(new \Swift_Plugins_LoggerPlugin($mailLogger));
}

$mailer->send($message->getSwiftMessage(), $failedRecipients);

// Debugging logging
Expand Down Expand Up @@ -154,19 +148,32 @@ protected function getInstance() {

switch ($this->config->getSystemValue('mail_smtpmode', 'php')) {
case 'smtp':
$this->instance = $this->getSMTPInstance();
$instance = $this->getSMTPInstance();
break;
case 'sendmail':
// FIXME: Move into the return statement but requires proper testing
// for SMTP and mail as well. Thus not really doable for a
// minor release.
$this->instance = \Swift_Mailer::newInstance($this->getSendMailInstance());
$instance = \Swift_Mailer::newInstance($this->getSendMailInstance());
break;
default:
$this->instance = $this->getMailInstance();
$instance = $this->getMailInstance();
break;
}

// Register plugins

// Enable logger if debug mode is enabled
if($this->config->getSystemValue('mail_smtpdebug', false)) {
$mailLogger = new \Swift_Plugins_Loggers_ArrayLogger();
$instance->registerPlugin(new \Swift_Plugins_LoggerPlugin($mailLogger));
}

// Enable antiflood on smtp connection (defaults to 100 mails before reconnect)
$instance->registerPlugin(new \Swift_Plugins_AntiFloodPlugin());

$this->instance = $instance;

return $this->instance;
}

Expand Down