From e860cf872c7bcc4f9db7e1490e5c8259d0c29b67 Mon Sep 17 00:00:00 2001 From: jmbardallo Date: Thu, 22 Oct 2026 13:56:07 +0200 Subject: [PATCH] fix(traces): unify script execution trace status to IN_PROGRESS and restore cancel restrictions --- CHANGELOG.md | 7 +++++++ src/Controller/CancelMultipleTracesAction.php | 10 ---------- src/Controller/OgAgent/RunScriptAction.php | 2 +- src/Controller/OgAgent/Webhook/StatusController.php | 9 +-------- 4 files changed, 9 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d0d2f00..3c644ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.14.2] - 2026-10-22 + +### Fixed +- **Consistencia de Estado en Trazas de Script (`RunScriptAction`, `CancelMultipleTracesAction`)**: + - `RunScriptAction`: Al actualizar trazas existentes desde la cola pendientes (`updateExistingTrace`), se unifica el estado a `IN_PROGRESS` (en lugar de `SENT`), alineándolo con la ejecución directa y con el estándar de scripts del sistema. + - `CancelMultipleTracesAction`: Revertida la cancelación de trazas en `SENT`, manteniendo la regla estricta que solo permite cancelar trazas en estado `pending` o `in-progress`. + ## [1.14.1] - 2026-10-22 ### Fixed diff --git a/src/Controller/CancelMultipleTracesAction.php b/src/Controller/CancelMultipleTracesAction.php index c5a4fbb..ea75dcc 100644 --- a/src/Controller/CancelMultipleTracesAction.php +++ b/src/Controller/CancelMultipleTracesAction.php @@ -38,16 +38,6 @@ class CancelMultipleTracesAction extends AbstractController $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']; continue; diff --git a/src/Controller/OgAgent/RunScriptAction.php b/src/Controller/OgAgent/RunScriptAction.php index 18a2d41..fb0738c 100644 --- a/src/Controller/OgAgent/RunScriptAction.php +++ b/src/Controller/OgAgent/RunScriptAction.php @@ -275,7 +275,7 @@ class RunScriptAction extends AbstractOgAgentController private function updateExistingTrace(Trace $trace, string $jobId, array $inputData, Client $client): void { - $status = ($this->isLinuxOrWindows($client) || $this->isLinuxOrWindowsSession($client)) ? TraceStatus::SENT : TraceStatus::IN_PROGRESS; + $status = TraceStatus::IN_PROGRESS; $trace->setStatus($status); $trace->setJobId($jobId); $this->entityManager->persist($trace); diff --git a/src/Controller/OgAgent/Webhook/StatusController.php b/src/Controller/OgAgent/Webhook/StatusController.php index 0b228e5..a2a0a22 100644 --- a/src/Controller/OgAgent/Webhook/StatusController.php +++ b/src/Controller/OgAgent/Webhook/StatusController.php @@ -173,14 +173,7 @@ 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) - ->createQueryBuilder('t') - ->where('t.client = :client') - ->andWhere('t.status IN (:statuses)') - ->setParameter('client', $client) - ->setParameter('statuses', [TraceStatus::IN_PROGRESS, TraceStatus::SENT]) - ->getQuery() - ->getResult(); + $traces = $this->entityManager->getRepository(Trace::class)->findBy(['client' => $client, 'status' => TraceStatus::IN_PROGRESS]); foreach ($traces as $trace) { $trace->setStatus(TraceStatus::SUCCESS); $trace->setFinishedAt(new \DateTime());