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

Add method for immediate scheduling/rescheduling cron tasks

Browse Source 
[MAILPOET-3726]
This commit is contained in:
Rostislav Wolny
2021-09-06 13:18:33 +02:00
committed by Veljko V
parent b9815c609f
commit c2c383e0b5
2 changed files with 54 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/Cron/CronWorkerScheduler.php
View File

@@ -23,6 +23,23 @@ class CronWorkerScheduler {
$this->scheduledTaskRepository = $scheduledTaskRepository;
}
public function scheduleImmediatelyIfNotRunning($taskType, $priority = ScheduledTaskEntity::PRIORITY_LOW): ScheduledTaskEntity {
$task = $this->scheduledTaskRepository->findScheduledOrRunningTask($taskType);
// Do nothing when task is running
if (($task instanceof ScheduledTaskEntity) && $task->getStatus() === null) {
return $task;
}
$now = Carbon::createFromTimestamp($this->wp->currentTime('timestamp'));
// Reschedule existing scheduled task
if ($task instanceof ScheduledTaskEntity) {
$task->setScheduledAt($now);
$task->setPriority($priority);
$this->scheduledTaskRepository->flush();
}
// Schedule new task
return $this->schedule($taskType, $now, $priority);
}
public function schedule($taskType, $nextRunDate, $priority = ScheduledTaskEntity::PRIORITY_LOW): ScheduledTaskEntity {
$alreadyScheduled = $this->scheduledTaskRepository->findScheduledTask($taskType);
if ($alreadyScheduled) {

37
tests/integration/Cron/CronWorkerSchedulerTest.php
View File

@@ -38,6 +38,43 @@ class CronWorkerSchedulerTest extends \MailPoetTest {
expect($this->entityManager->getRepository(ScheduledTaskEntity::class)->findAll())->count(1);
}
public function testItDoesntScheduleRunningTaskImmediatelyIfRunning() {
$nextRunDate = Carbon::now()->addWeek();
$task = $this->cronWorkerScheduler->schedule('test', $nextRunDate);
$task->setStatus(null);
$this->entityManager->flush();
$immediateTask = $this->cronWorkerScheduler->scheduleImmediatelyIfNotRunning('test');
$tasks = $this->entityManager->getRepository(ScheduledTaskEntity::class)->findAll();
expect($immediateTask->getId())->equals($task->getId());
expect($tasks)->count(1);
expect($tasks[0]->getType())->same('test');
expect($tasks[0]->getStatus())->null();
expect($tasks[0]->getScheduledAt())->same($nextRunDate);
}
public function testItRescheduleScheduledTaskImmediatelyIfNotRunning() {
$nextRunDate = Carbon::now()->addWeek();
$task = $this->cronWorkerScheduler->schedule('test', $nextRunDate);
$immediateTask = $this->cronWorkerScheduler->scheduleImmediatelyIfNotRunning('test');
$tasks = $this->entityManager->getRepository(ScheduledTaskEntity::class)->findAll();
expect($immediateTask->getId())->equals($task->getId());
expect($tasks)->count(1);
expect($tasks[0]->getType())->same('test');
expect($tasks[0]->getStatus())->same(ScheduledTask::STATUS_SCHEDULED);
expect($tasks[0]->getScheduledAt())->greaterOrEquals(Carbon::now()->subSecond());
expect($tasks[0]->getScheduledAt())->lessOrEquals(Carbon::now()->addSecond());
}
public function testItScheduleTaskImmediatelyIfNotRunning() {
$this->cronWorkerScheduler->scheduleImmediatelyIfNotRunning('test');
$tasks = $this->entityManager->getRepository(ScheduledTaskEntity::class)->findAll();
expect($tasks)->count(1);
expect($tasks[0]->getType())->equals('test');
expect($tasks[0]->getStatus())->equals(ScheduledTask::STATUS_SCHEDULED);
expect($tasks[0]->getScheduledAt())->greaterOrEquals(Carbon::now()->subSecond());
expect($tasks[0]->getScheduledAt())->lessOrEquals(Carbon::now()->addSecond());
}
public function testItReschedulesTask() {
$nextRunDate = Carbon::now()->subDay();
$task = $this->cronWorkerScheduler->schedule('test', $nextRunDate);