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

- Rebases master

Browse Source 
- Updates sending limit logic
This commit is contained in:
Vlad
2016-07-28 22:47:22 -04:00
parent 1be7fda1cf
commit c056e95249
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Cron/Workers/SendingQueue/SendingQueue.php
View File

@@ -22,13 +22,14 @@ class SendingQueue {
$this->mailer_task = new MailerTask(); $this->mailer_task = new MailerTask();
$this->newsletter_task = new NewsletterTask(); $this->newsletter_task = new NewsletterTask();
$this->timer = ($timer) ? $timer : microtime(true); $this->timer = ($timer) ? $timer : microtime(true);
// abort if sending and/or execution limit are reached // abort if sending limit is reached
$this->mailer_task->enforceSendingLimit();
CronHelper::enforceExecutionLimit($this->timer); CronHelper::enforceExecutionLimit($this->timer);
} }
function process() { function process() {
foreach(self::getRunningQueues() as $queue) { foreach(self::getRunningQueues() as $queue) {
// abort if sending limit is reached
$this->mailer_task->enforceSendingLimit();
// get and pre-process newsletter (render, replace shortcodes/links, etc.) // get and pre-process newsletter (render, replace shortcodes/links, etc.)
$newsletter = $this->newsletter_task->getAndPreProcess($queue->asArray()); $newsletter = $this->newsletter_task->getAndPreProcess($queue->asArray());
if(!$newsletter) { if(!$newsletter) {
@@ -158,10 +159,9 @@ class SendingQueue {
StatisticsNewslettersModel::createMultiple($statistics); StatisticsNewslettersModel::createMultiple($statistics);
// keep track of sent items // keep track of sent items
$this->mailer_task->updateMailerLog(); $this->mailer_task->updateMailerLog();
$subscribers_to_process_count = count($queue->subscribers['to_process']);
$queue = $this->updateQueue($queue); $queue = $this->updateQueue($queue);
// check sending limit if there are still subscribers left to send // enforce sending limit if there are still subscribers left to process
if(isset($subscribers_to_process_count)) { if($queue->count_to_process) {
$this->mailer_task->enforceSendingLimit(); $this->mailer_task->enforceSendingLimit();
} }
} }