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

Add reset in progress state for sending queue tasks

Browse Source 
[MAILPOET-3608]
This commit is contained in:
Jan Lysý
2021-05-19 10:46:51 +02:00
committed by Veljko V
parent 6c54c5900c
commit 55b4051e3f
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -97,7 +97,14 @@ class SendingQueue {
$task = $queue->task();
if (!$task instanceof ScheduledTask) continue;
if ($this->isInProgress($task)) continue;
if ($this->isInProgress($task)) {
if ($this->isTimeout($task)) {
$this->stopProgress($task);
} else {
continue;
}
}
$this->startProgress($task);
@@ -430,8 +437,20 @@ class SendingQueue {
$task->save();
}
public function getExecutionLimit(): int {
// Convert seconds to minutes
return (int)round($this->cronHelper->getDaemonExecutionLimit() * 2 / 60);
private function isTimeout(ScheduledTask $task): bool {
$currentTime = Carbon::createFromTimestamp($this->wp->currentTime('timestamp'));
$updated = strtotime((string)$task->updatedAt);
if ($updated !== false) {
$updatedAt = Carbon::createFromTimestamp($updated);
}
if (isset($updatedAt) && $updatedAt->diffInSeconds($currentTime, false) > $this->getExecutionLimit()) {
return true;
}
return false;
}
private function getExecutionLimit(): int {
return $this->cronHelper->getDaemonExecutionLimit() * 3;
}
}