Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Make rendering error during sending more descriptive [MAILPOET-1232]

Browse Source
This commit is contained in:
stoletniy
2017-11-30 19:45:53 +03:00
parent 97fb5cf66f
commit 8afe7f5d97
4 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Cron/Workers/SendingQueue/Tasks/Newsletter.php
View File

@@ -57,7 +57,7 @@ class Newsletter {
// return the newsletter if it was previously rendered
if(!is_null($queue->getNewsletterRenderedBody())) {
return (!$queue->validate()) ?
$this->stopNewsletterPreProcessing() :
$this->stopNewsletterPreProcessing(sprintf('QUEUE-%d-RENDER', $queue->id)) :
$newsletter;
}
// if tracking is enabled, do additional processing
@@ -111,7 +111,7 @@ class Newsletter {
$queue_errors = ($queue->validate() !== true);
}
if($queue_errors) {
$this->stopNewsletterPreProcessing();
$this->stopNewsletterPreProcessing(sprintf('QUEUE-%d-SAVE', $queue->id));
}
return $newsletter;
}
@@ -169,10 +169,11 @@ class Newsletter {
return Helpers::flattenArray($segments);
}
function stopNewsletterPreProcessing() {
function stopNewsletterPreProcessing($error_code = null) {
MailerLog::processError(
'queue_save',
__('There was an error processing your newsletter during sending. If possible, please contact us and report this issue.')
__('There was an error processing your newsletter during sending. If possible, please contact us and report this issue.'),
$error_code
);
}
}