espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix email queue 2

Browse Source
This commit is contained in:
yuri
2017-02-09 15:39:17 +02:00
parent 9f3fdd01bf
commit 170e62bc8b
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/Modules/Crm/Services/MassEmail.php
+15 -8
View File
@@ -440,6 +440,8 @@ class MassEmail extends \Espo\Services\Record
$params['replyToName'] = $massEmail->get('replyToName');
}
$isSent = false;
try {
$attemptCount = $queueItem->get('attemptCount');
$attemptCount++;
@@ -453,6 +455,19 @@ class MassEmail extends \Espo\Services\Record
$this->getMailSender()->useGlobal()->send($email, $params, $message, $attachmentList);
$isSent = true;
} catch (\Exception $e) {
if ($queueItem->get('attemptCount') >= self::MAX_ATTEMPT_COUNT) {
$queueItem->set('status', 'Failed');
} else {
$queueItem->set('status', 'Pending');
}
$this->getEntityManager()->saveEntity($queueItem);
$GLOBALS['log']->error('MassEmail#sendQueueItem: [' . $e->getCode() . '] ' .$e->getMessage());
return false;
}
if ($isSent) {
$emailObject = $emailTemplate;
if ($massEmail->get('storeSentEmails') && !$isTest) {
$this->getEntityManager()->saveEntity($email);
@@ -468,14 +483,6 @@ class MassEmail extends \Espo\Services\Record
if ($campaign) {
$this->getCampaignService()->logSent($campaign->id, $queueItem->id, $target, $emailObject, $target->get('emailAddress'), null, $queueItem->get('isTest'));
}
} catch (\Exception $e) {
if ($queueItem->get('attemptCount') >= self::MAX_ATTEMPT_COUNT) {
$queueItem->set('status', 'Failed');
}
$this->getEntityManager()->saveEntity($queueItem);
$GLOBALS['log']->error('MassEmail#sendQueueItem: [' . $e->getCode() . '] ' .$e->getMessage());
return false;
}
return true;