mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-10-21 16:46:11 +02:00
Code Issues Releases Wiki Activity

Swift_Message creation is now lazy when using callback

Browse Source 
Swift_Message object is not created until right before the message is
sent, if it is sent at all. This prevents the expensive Swift_Mailer
autoloader from being invoked.

Swift_Mailer is now also required to run test suite
This commit is contained in:
John Kary
2015-03-01 19:25:14 -06:00
parent 1b34cd4d88
commit f5eaeeb144
3 changed files with 64 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/Monolog/Handler/SwiftMailerHandler.php
View File

@@ -32,13 +32,8 @@ class SwiftMailerHandler extends MailHandler
public function __construct(\Swift_Mailer $mailer, $message, $level = Logger::ERROR, $bubble = true)
{
parent::__construct($level, $bubble);
$this->mailer = $mailer;
if (!$message instanceof \Swift_Message && is_callable($message)) {
$message = call_user_func($message);
}
if (!$message instanceof \Swift_Message) {
throw new \InvalidArgumentException('You must provide either a Swift_Message instance or a callable returning it');
}
$this->mailer = $mailer;
$this->message = $message;
}
@@ -47,10 +42,31 @@ class SwiftMailerHandler extends MailHandler
*/
protected function send($content, array $records)
{
$message = clone $this->message;
$this->mailer->send($this->buildMessage($content));
}
/**
* Creates instance of Swift_Message to be sent
*
* @param string $content
* @return \Swift_Message
*/
protected function buildMessage($content)
{
$message = null;
if ($this->message instanceof \Swift_Message) {
$message = clone $this->message;
} else if (is_callable($this->message)) {
$message = call_user_func($this->message);
}
if (!$message instanceof \Swift_Message) {
throw new \InvalidArgumentException('Could not resolve message as instance of Swift_Message or a callable returning it');
}
$message->setBody($content);
$message->setDate(time());
$this->mailer->send($message);
return $message;
}
}