diff --git a/CHANGELOG.md b/CHANGELOG.md index c9fa5aa..d0d2f00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.14.1] - 2026-10-22 + +### Fixed +- **Resolución y Cancelación de Tareas en Estado Enviado (`StatusController`, `CancelMultipleTracesAction`)**: + - `CancelMultipleTracesAction`: Permite cancelar de forma explícita trazas que se encuentran en estado `sent` (`SENT`), eliminando el bloqueo que impedía cancelar tareas en vuelo o pendientes de respuesta. + - `StatusController`: En el webhook de reinicio y apagado (`REBOOT` / `POWEROFF`), se resuelven automáticamente a éxito tanto las trazas en progreso (`IN_PROGRESS`) como las enviadas (`SENT`), asegurando que los scripts que provocan el reinicio del equipo (como los scripts de congelación/descongelación) cierren su ciclo de ejecución correctamente. + ## [1.14.0] - 2026-10-22 ### Added diff --git a/src/Controller/CancelMultipleTracesAction.php b/src/Controller/CancelMultipleTracesAction.php index 417fcd2..c5a4fbb 100644 --- a/src/Controller/CancelMultipleTracesAction.php +++ b/src/Controller/CancelMultipleTracesAction.php @@ -36,6 +36,17 @@ class CancelMultipleTracesAction extends AbstractController $this->killJobService->kill($trace, (string) $trace->getJobId()); } elseif ($trace->getStatus() === TraceStatus::PENDING) { $trace->setStatus(TraceStatus::CANCELLED); + $trace->setFinishedAt(new \DateTime()); + $this->entityManager->persist($trace); + } elseif ($trace->getStatus() === TraceStatus::SENT) { + if ($trace->getJobId()) { + try { + $this->killJobService->kill($trace, (string) $trace->getJobId()); + } catch (\Throwable) { + } + } + $trace->setStatus(TraceStatus::CANCELLED); + $trace->setFinishedAt(new \DateTime()); $this->entityManager->persist($trace); } else { $failed[] = ['trace' => $trace->getUuid(), 'reason' => 'not cancellable']; diff --git a/src/Controller/OgAgent/Webhook/StatusController.php b/src/Controller/OgAgent/Webhook/StatusController.php index a2a0a22..0b228e5 100644 --- a/src/Controller/OgAgent/Webhook/StatusController.php +++ b/src/Controller/OgAgent/Webhook/StatusController.php @@ -173,7 +173,14 @@ class StatusController extends AbstractController $clientIp = $data['iph'] ?? $request->getClientIp(); $client = $this->entityManager->getRepository(Client::class)->findOneBy(['ip' => $clientIp]); if ($client) { - $traces = $this->entityManager->getRepository(Trace::class)->findBy(['client' => $client, 'status' => TraceStatus::IN_PROGRESS]); + $traces = $this->entityManager->getRepository(Trace::class) + ->createQueryBuilder('t') + ->where('t.client = :client') + ->andWhere('t.status IN (:statuses)') + ->setParameter('client', $client) + ->setParameter('statuses', [TraceStatus::IN_PROGRESS, TraceStatus::SENT]) + ->getQuery() + ->getResult(); foreach ($traces as $trace) { $trace->setStatus(TraceStatus::SUCCESS); $trace->setFinishedAt(new \DateTime());