fix(traces): allow cancelling SENT traces and resolve SENT traces on reboot/poweroff
parent
90605c7b11
commit
f6ff7c1e7d
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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'];
|
||||
|
|
|
|||
|
|
@ -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());
|
||||
|
|
|
|||
Loading…
Reference in New Issue