223c2e1562
We want to process errors for individual subscribers. Subscriber errors were inlined into error message string. This commit changes this so that we are now able to get subscriber errors as a data which are easy to process further. [MAILPOET-1154]
35 lines
1.2 KiB
PHP
35 lines
1.2 KiB
PHP
<?php
|
|
namespace MailPoet\Mailer\Methods\ErrorMappers;
|
|
|
|
use MailPoet\Mailer\MailerError;
|
|
use MailPoet\Mailer\Mailer;
|
|
use MailPoet\Mailer\SubscriberError;
|
|
|
|
class SMTPMapper {
|
|
use ConnectionErrorMapperTrait;
|
|
|
|
function getErrorFromException(\Exception $e) {
|
|
// remove redundant information appended by Swift logger to exception messages
|
|
$message = explode(PHP_EOL, $e->getMessage());
|
|
return new MailerError(MailerError::OPERATION_SEND, MailerError::LEVEL_HARD, $message[0]);
|
|
}
|
|
|
|
function getErrorFromLog($log, $subscriber, $extra_params = []) {
|
|
// extract error message from log
|
|
preg_match('/!! (.*?)>>/ism', $log, $message);
|
|
if(!empty($message[1])) {
|
|
$message = $message[1];
|
|
// remove line breaks from the message due to how logger's dump() method works
|
|
$message = preg_replace('/\r|\n/', '', $message);
|
|
} else {
|
|
$message = sprintf(__('%s has returned an unknown error.', 'mailpoet'), Mailer::METHOD_SMTP);
|
|
}
|
|
|
|
$subscriber_errors = [];
|
|
if(empty($extra_params['test_email'])) {
|
|
$subscriber_errors[] = new SubscriberError($subscriber, null);
|
|
}
|
|
return new MailerError(MailerError::OPERATION_SEND, MailerError::LEVEL_HARD, $message, null, $subscriber_errors);
|
|
}
|
|
}
|