fix(ogcore): fix scheduled task execution and UTC timezone handling
testing/ogcore-api/pipeline/head There was a failure building this commit Details
testing/ogcore-api/pipeline/pr-main There was a failure building this commit Details

- Fix executeReboot response check: use getStatusCode() instead of
  json_decode(body)['status'], which never matched the Client entity body
- Fix executeRunScript: same check fix; remove duplicate trace status
  update since RunScriptAction already handles it via updateExistingTrace
- Normalize executionDate/executionTime to UTC at API boundary in
  CommandTaskScheduleInput to prevent client/server timezone drift
- Use UTC consistently in calculateNextExecutionDate and
  RunScheduledCommandTasksCommand for all datetime comparisons
- Replace 30-second execution window (abs(difference) < 30) with
  isDue && notYetExecuted logic so tasks missed by the cron are
  recovered in the next cycle instead of being skipped forever
- Skip one-time (none) tasks with a past executionDate in
  calculateNextExecutionDate so nextExecution is set to null after
  execution and the task no longer appears in cron logs
pull/106/head
Nicolas Arenas 2026-05-06 15:30:37 +02:00
parent 7fc2a10ff6
commit a8cdae154b
4 changed files with 36 additions and 26 deletions

View File

@ -425,16 +425,8 @@ class ExecutePendingTracesCommand extends Command
try {
$response = $this->runScriptAction->__invoke($commandExecuteInput, $trace);
if (json_decode($response->getContent(), true)['status'] === 200) {
$trace->setStatus(TraceStatus::SUCCESS);
$trace->setFinishedAt(new \DateTime());
$this->entityManager->persist($trace);
$this->entityManager->flush();
return true;
}
return false;
return $response->getStatusCode() === 200;
} catch (\Exception $e) {
$this->logger->error('Error executing run script', [
'input' => $commandExecuteInput,
@ -464,15 +456,15 @@ class ExecutePendingTracesCommand extends Command
try {
$response = $this->rebootAction->__invoke($multipleClientsInput);
if (json_decode($response->getContent(), true)['status'] === 200) {
if ($response->getStatusCode() === 200) {
$trace->setStatus(TraceStatus::SUCCESS);
$trace->setFinishedAt(new \DateTime());
$this->entityManager->persist($trace);
$this->entityManager->flush();
return true;
}
return false;
} catch (\Exception $e) {
return false;

View File

@ -50,7 +50,7 @@ class RunScheduledCommandTasksCommand extends Command
*/
protected function execute(InputInterface $input, OutputInterface $output): int
{
$now = new \DateTimeImmutable('now');
$now = new \DateTimeImmutable('now', new \DateTimeZone('UTC'));
$tasks = $this->commandTaskRepository->findAll();
@ -68,7 +68,12 @@ class RunScheduledCommandTasksCommand extends Command
$output->writeln("NextExecution: " . $nextExecution->format('Y-m-d H:i:s T'));
$output->writeln("Diferencia: $difference segundos para la tarea {$task->getName()}");
if (abs($difference) < 30) {
$lastExecution = $task->getLastExecution();
$isDue = $difference >= 0;
$notYetExecuted = $lastExecution === null
|| $lastExecution->getTimestamp() < $nextExecution->getTimestamp();
if ($isDue && $notYetExecuted) {
$output->writeln("Ejecutando tarea: " . $task->getName());
$scripts = $task->getCommandTaskScripts()->toArray();
@ -80,7 +85,7 @@ class RunScheduledCommandTasksCommand extends Command
$this->createTraceForScript($script, $task, $output);
}
$task->setLastExecution(new \DateTimeImmutable('now'));
$task->setLastExecution(new \DateTimeImmutable('now', new \DateTimeZone('UTC')));
$task->setNextExecution($task->calculateNextExecutionDate());
$this->entityManager->persist($task);

View File

@ -74,12 +74,22 @@ final class CommandTaskScheduleInput
$commandTaskSchedule = new CommandTaskSchedule();
}
$utc = new \DateTimeZone('UTC');
if ($this->commandTask) {
$commandTaskSchedule->setCommandTask($this->commandTask->getEntity());
}
$commandTaskSchedule->setRecurrenceType($this->recurrenceType);
$commandTaskSchedule->setExecutionTime($this->executionTime);
$commandTaskSchedule->setExecutionDate($this->executionDate);
$commandTaskSchedule->setExecutionTime(
$this->executionTime
? \DateTime::createFromInterface($this->executionTime)->setTimezone($utc)
: null
);
$commandTaskSchedule->setExecutionDate(
$this->executionDate
? \DateTime::createFromInterface($this->executionDate)->setTimezone($utc)
: null
);
$commandTaskSchedule->setRecurrenceDetails($this->recurrenceDetails);
$commandTaskSchedule->setEnabled($this->enabled);

View File

@ -219,7 +219,8 @@ class CommandTask extends AbstractEntity
*/
public function calculateNextExecutionDate(): ?\DateTimeInterface
{
$now = new \DateTime();
$utc = new \DateTimeZone('UTC');
$now = new \DateTime('now', $utc);
$closestDateTime = null;
foreach ($this->getCommandTaskSchedules() as $schedule) {
@ -231,13 +232,14 @@ class CommandTask extends AbstractEntity
if ($executionTime !== null) {
$execDateTime = \DateTime::createFromFormat(
'Y-m-d H:i:s',
$execDate->format('Y-m-d') . ' ' . $executionTime->format('H:i:s')
$execDate->format('Y-m-d') . ' ' . $executionTime->format('H:i:s'),
$utc
);
} else {
$execDateTime = $execDate;
$execDateTime = \DateTime::createFromInterface($execDate)->setTimezone($utc);
}
if ($closestDateTime === null || $execDateTime < $closestDateTime) {
if ($execDateTime > $now && ($closestDateTime === null || $execDateTime < $closestDateTime)) {
$closestDateTime = $execDateTime;
}
} else {
@ -246,13 +248,13 @@ class CommandTask extends AbstractEntity
continue;
}
$init = (new \DateTime($details['initDate'] ?? 'now'))->setTime(0, 0);
$end = (new \DateTime($details['endDate'] ?? '+1 year'))->setTime(0, 0);
$init = (new \DateTime($details['initDate'] ?? 'now', $utc))->setTime(0, 0);
$end = (new \DateTime($details['endDate'] ?? '+1 year', $utc))->setTime(0, 0);
$validDays = array_map('mb_strtolower', $details['daysOfWeek'] ?? []);
$validMonths = array_map('mb_strtolower', $details['months'] ?? []);
$current = (new \DateTime())->setTime(0, 0);
$current = (new \DateTime('now', $utc))->setTime(0, 0);
while ($current <= $end) {
if ($current < $init) {
@ -267,7 +269,8 @@ class CommandTask extends AbstractEntity
if ($executionTime !== null) {
$execDateTime = \DateTime::createFromFormat(
'Y-m-d H:i:s',
$current->format('Y-m-d') . ' ' . $executionTime->format('H:i:s')
$current->format('Y-m-d') . ' ' . $executionTime->format('H:i:s'),
$utc
);
} else {
$execDateTime = clone $current;