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

Delete task when no newsletter was found

Browse Source 
When no corresponding newsletter was found the task can be deleted. The behavior
before meant that such a task would remain forever in the database with the
status 'running'.

[MAILPOET-4699]
This commit is contained in:
David Remer
2022-10-06 10:09:22 +03:00
committed by Veljko V
parent 357dede83d
commit 307989a0c6
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mailpoet/lib/Cron/Workers/SendingQueue/SendingQueue.php
View File

@ -156,17 +156,14 @@ class SendingQueue {
$newsletterEntity = $this->newsletterTask->getNewsletterFromQueue($queue); $newsletterEntity = $this->newsletterTask->getNewsletterFromQueue($queue);
if (!$newsletterEntity) { if (!$newsletterEntity) {
$this->deleteTask($queue);
return; return;
} }
// pre-process newsletter (render, replace shortcodes/links, etc.) // pre-process newsletter (render, replace shortcodes/links, etc.)
$newsletterEntity = $this->newsletterTask->preProcessNewsletter($newsletterEntity, $queue); $newsletterEntity = $this->newsletterTask->preProcessNewsletter($newsletterEntity, $queue);
if (!$newsletterEntity) { if (!$newsletterEntity) {
$this->loggerFactory->getLogger(LoggerFactory::TOPIC_NEWSLETTERS)->info( $this->deleteTask($queue);
'delete task in sending queue',
['task_id' => $queue->taskId]
);
$queue->delete();
return; return;
} }
@ -494,4 +491,12 @@ class SendingQueue {
private function getExecutionLimit(): int { private function getExecutionLimit(): int {
return $this->cronHelper->getDaemonExecutionLimit() * 3; return $this->cronHelper->getDaemonExecutionLimit() * 3;
} }
private function deleteTask(SendingTask $queue) {
$this->loggerFactory->getLogger(LoggerFactory::TOPIC_NEWSLETTERS)->info(
'delete task in sending queue',
['task_id' => $queue->taskId]
);
$queue->delete();
}
} }