From 6adbec0fe9741bda660e4874d4600f1f5ef3b6fb Mon Sep 17 00:00:00 2001 From: Manuel Aranda Date: Mon, 4 Aug 2025 12:34:55 +0200 Subject: [PATCH] solve conflicts --- etc/cron.d/opengnsys-check-clients | 4 +++- src/State/Processor/ImageProcessor.php | 5 +++-- src/State/Processor/PartitionProcessor.php | 5 +++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/etc/cron.d/opengnsys-check-clients b/etc/cron.d/opengnsys-check-clients index e762794..28f5e88 100644 --- a/etc/cron.d/opengnsys-check-clients +++ b/etc/cron.d/opengnsys-check-clients @@ -1 +1,3 @@ -*/5 * * * * opengnsys php -d memory_limit=512M /opt/opengnsys/ogcore/api/bin/console opengnsys:check-client-availability >> /opt/opengnsys/ogcore/api/var/log/cron.log 2>&1 +*/2 * * * * opengnsys php -d memory_limit=512M /opt/opengnsys/ogcore/api/bin/console opengnsys:check-client-availability>> /opt/opengnsys/ogcore/api/var/log/cron.log 2>&1 +*/1 * * * * opengnsys php -d memory_limit=512M /opt/opengnsys/ogcore/api/bin/console opengnsys:run-scheduled-command-tasks>> /opt/opengnsys/ogcore/api/var/log/cron.log 2>&1 +*/1 * * * * opengnsys php -d memory_limit=512M /opt/opengnsys/ogcore/api/bin/console opengnsys:execute-pending-traces>> /opt/opengnsys/ogcore/api/var/log/cron.log 2>&1 \ No newline at end of file diff --git a/src/State/Processor/ImageProcessor.php b/src/State/Processor/ImageProcessor.php index 92545bd..b1b9bc1 100644 --- a/src/State/Processor/ImageProcessor.php +++ b/src/State/Processor/ImageProcessor.php @@ -89,8 +89,9 @@ readonly class ImageProcessor implements ProcessorInterface } if ($response instanceof JsonResponse && $response->getStatusCode() === 200) { - $jobContent = json_decode($response->getContent(), true); - return new JsonResponse(data: $jobContent, status: Response::HTTP_OK); + $jobContent = json_decode($response->getContent(), true, 512, JSON_UNESCAPED_SLASHES); + $jsonString = json_encode($jobContent, JSON_UNESCAPED_SLASHES); + return new JsonResponse($jsonString, Response::HTTP_OK, [], true); } return new JsonResponse(data: ['/clients/' . $image->getClient()->getUuid() => ['headers' => []]], status: Response::HTTP_OK); diff --git a/src/State/Processor/PartitionProcessor.php b/src/State/Processor/PartitionProcessor.php index 583061e..d127e4b 100644 --- a/src/State/Processor/PartitionProcessor.php +++ b/src/State/Processor/PartitionProcessor.php @@ -78,8 +78,9 @@ readonly class PartitionProcessor implements ProcessorInterface // Si hay una respuesta exitosa, devolvemos el contenido del job ID if ($response instanceof JsonResponse && $response->getStatusCode() === 200) { - $jobContent = json_decode($response->getContent(), true); - return new JsonResponse(data: $jobContent, status: Response::HTTP_OK); + $jobContent = json_decode($response->getContent(), true, 512, JSON_UNESCAPED_SLASHES); + $jsonString = json_encode($jobContent, JSON_UNESCAPED_SLASHES); + return new JsonResponse($jsonString, Response::HTTP_OK, [], true); } return new JsonResponse('OK', Response::HTTP_NO_CONTENT);