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

Extract subscribers to a separate table in the Bounce worker [MAILPOET-940]

Browse Source
This commit is contained in:
stoletniy
2017-07-11 16:30:44 +03:00
parent b24c51d800
commit 6a9b8d88c2
8 changed files with 162 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/Cron/Workers/Bounce.php
View File

@@ -4,6 +4,8 @@ namespace MailPoet\Cron\Workers;
use MailPoet\Cron\CronHelper;
use MailPoet\Mailer\Mailer;
use MailPoet\Models\ScheduledTask;
use MailPoet\Models\ScheduledTaskSubscriber;
use MailPoet\Tasks\Subscribers\BatchIterator;
use MailPoet\Models\Subscriber;
use MailPoet\Services\Bridge;
use MailPoet\Services\Bridge\API;
@@ -48,28 +50,19 @@ class Bounce extends SimpleWorker {
}
// update current task
$task->subscribers = serialize(
array(
'to_process' => $subscribers
)
);
$task->count_total = $task->count_to_process = count($subscribers);
ScheduledTaskSubscriber::addSubscribers($task->id, $subscribers);
return parent::prepareTask($task);
}
function processTask(ScheduledTask $task) {
$task->subscribers = $task->getSubscribers();
if(empty($task->subscribers['to_process'])) {
$subscriber_batches = new BatchIterator($task->id, self::BATCH_SIZE);
if(count($subscriber_batches) === 0) {
$task->delete();
return false;
}
$subscriber_batches = array_chunk(
$task->subscribers['to_process'],
self::BATCH_SIZE
);
foreach($subscriber_batches as $subscribers_to_process_ids) {
// abort if execution limit is reached
CronHelper::enforceExecutionLimit($this->timer);