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

Add post notification logging

Browse Source 
[MAILPOET-1536]
This commit is contained in:
Pavel Dohnal
2018-10-01 14:39:49 +02:00
parent b0f5b4cfe9
commit e4db455a47
4 changed files with 57 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/Cron/Workers/Scheduler.php
View File

@@ -4,6 +4,7 @@ namespace MailPoet\Cron\Workers;
use Carbon\Carbon;
use MailPoet\Cron\CronHelper;
use MailPoet\Logging\Logger;
use MailPoet\Models\Newsletter;
use MailPoet\Models\ScheduledTask;
use MailPoet\Models\Segment;
@@ -75,9 +76,17 @@ class Scheduler {
}
function processPostNotificationNewsletter($newsletter, $queue) {
Logger::getLogger('post-notifications')->addInfo(
'process post notification in scheduler',
['newsletter_id' => $newsletter->id, 'task_id' => $queue->task_id]
);
// ensure that segments exist
$segments = $newsletter->segments()->findArray();
if(empty($segments)) {
Logger::getLogger('post-notifications')->addInfo(
'post notification no segments',
['newsletter_id' => $newsletter->id, 'task_id' => $queue->task_id]
);
return $this->deleteQueueOrUpdateNextRunDate($queue, $newsletter);
}
@@ -87,6 +96,10 @@ class Scheduler {
$subscribers_count = $finder->addSubscribersToTaskFromSegments($queue->task(), $segments);
if(empty($subscribers_count)) {
Logger::getLogger('post-notifications')->addInfo(
'post notification no subscribers',
['newsletter_id' => $newsletter->id, 'task_id' => $queue->task_id]
);
return $this->deleteQueueOrUpdateNextRunDate($queue, $newsletter);
}
@@ -100,6 +113,10 @@ class Scheduler {
$queue->save();
// update notification status
$notification_history->setStatus(Newsletter::STATUS_SENDING);
Logger::getLogger('post-notifications')->addInfo(
'post notification set status to sending',
['newsletter_id' => $newsletter->id, 'task_id' => $queue->task_id]
);
return true;
}

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

@@ -5,6 +5,7 @@ use MailPoet\Cron\CronHelper;
use MailPoet\Cron\Workers\SendingQueue\Tasks\Links;
use MailPoet\Cron\Workers\SendingQueue\Tasks\Mailer as MailerTask;
use MailPoet\Cron\Workers\SendingQueue\Tasks\Newsletter as NewsletterTask;
use MailPoet\Logging\Logger;
use MailPoet\Mailer\MailerError;
use MailPoet\Mailer\MailerLog;
use MailPoet\Models\ScheduledTask as ScheduledTaskModel;
@@ -48,6 +49,10 @@ class SendingQueue {
// pre-process newsletter (render, replace shortcodes/links, etc.)
$newsletter = $this->newsletter_task->preProcessNewsletter($newsletter, $queue);
if(!$newsletter) {
Logger::getLogger('newsletters')->addInfo(
'delete task in sending queue',
['newsletter_id' => $newsletter->id(), 'task_id' => $queue->task_id]
);
$queue->delete();
continue;
}