diff --git a/src/Command/ExecutePendingTracesCommand.php b/src/Command/ExecutePendingTracesCommand.php index 378f5b5..7f37f43 100644 --- a/src/Command/ExecutePendingTracesCommand.php +++ b/src/Command/ExecutePendingTracesCommand.php @@ -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; diff --git a/src/Command/RunScheduledCommandTasksCommand.php b/src/Command/RunScheduledCommandTasksCommand.php index 4385c3d..f57456f 100644 --- a/src/Command/RunScheduledCommandTasksCommand.php +++ b/src/Command/RunScheduledCommandTasksCommand.php @@ -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); diff --git a/src/Dto/Input/CommandTaskScheduleInput.php b/src/Dto/Input/CommandTaskScheduleInput.php index 5802b88..6f6d272 100644 --- a/src/Dto/Input/CommandTaskScheduleInput.php +++ b/src/Dto/Input/CommandTaskScheduleInput.php @@ -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); diff --git a/src/Entity/CommandTask.php b/src/Entity/CommandTask.php index 4caf661..1693df1 100644 --- a/src/Entity/CommandTask.php +++ b/src/Entity/CommandTask.php @@ -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;