From 94721d437166a08c49e480deb5d3ed9809eef581 Mon Sep 17 00:00:00 2001 From: Manuel Aranda Date: Wed, 12 Mar 2025 09:05:04 +0100 Subject: [PATCH 1/3] Updated and fixed cancel P2p transmission --- .../OgRepository/Image/CancelTransmissionAction.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Controller/OgRepository/Image/CancelTransmissionAction.php b/src/Controller/OgRepository/Image/CancelTransmissionAction.php index eec94f2..9d79b51 100644 --- a/src/Controller/OgRepository/Image/CancelTransmissionAction.php +++ b/src/Controller/OgRepository/Image/CancelTransmissionAction.php @@ -8,6 +8,7 @@ use App\Entity\Image; use App\Entity\ImageImageRepository; use App\Entity\Trace; use App\Model\CommandTypes; +use App\Model\DeployMethodTypes; use App\Model\TraceStatus; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Response; @@ -52,7 +53,11 @@ class CancelTransmissionAction extends AbstractOgRepositoryController throw new ValidatorException('Fullsum is required'); } - $content = $this->createRequest('DELETE', 'http://'.$image->getRepository()->getIp().':8006/ogrepository/v1/'.$method.'/images/'.$image->getImageFullsum()); + if ($method === DeployMethodTypes::TORRENT) { + $content = $this->createRequest('DELETE', 'http://'.$image->getRepository()->getIp().':8006/ogrepository/v1/p2p'); + } else { + $content = $this->createRequest('DELETE', 'http://'.$image->getRepository()->getIp().':8006/ogrepository/v1/'.$method.'/images/'.$image->getImageFullsum()); + } if (isset($content['error']) && $content['error'] === Response::HTTP_INTERNAL_SERVER_ERROR ) { throw new ValidatorException('Error cancelling transmission'); From f94f8fe3e5ce404a2450506446705c51e181aaf6 Mon Sep 17 00:00:00 2001 From: Nicolas Arenas Date: Wed, 12 Mar 2025 09:19:39 +0100 Subject: [PATCH 2/3] Add mercure service to docker-compose for deploy --- docker-compose-deploy.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/docker-compose-deploy.yml b/docker-compose-deploy.yml index f45ff4d..c0c7fa2 100644 --- a/docker-compose-deploy.yml +++ b/docker-compose-deploy.yml @@ -39,9 +39,32 @@ services: - ogcore-network image: opengnsys/ogcore-php:static + mercure: + image: dunglas/mercure + restart: unless-stopped + container_name: ogcore-mercure + environment: + # Uncomment the following line to disable HTTPS, + SERVER_NAME: ':3000' + MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!' + MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!' + MERCURE_EXTRA_DIRECTIVES: | + cors_origins * + # Comment the following line to disable the development mode + command: /usr/bin/caddy run --config /etc/caddy/dev.Caddyfile + ports: + - "3000:3000" + volumes: + - mercure_data:/data + - mercure_config:/config + networks: + - ogcore-network + volumes: database_data: ogpublic: + mercure_data: + mercure_config: networks: From b534738587c97cd80237fb961aa6a0f492232c58 Mon Sep 17 00:00:00 2001 From: Manuel Aranda Date: Wed, 12 Mar 2025 09:22:45 +0100 Subject: [PATCH 3/3] Updated changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f1a4fda..1d34248 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,8 @@ # Changelog +## [0.9.1] - 2025-03-12 +### 🐛 Fixed +- Corrección en la cancelacion de transmisiones p2p. + ## [0.9.0] - 2025-03-04 ### 🔹 Added - Nueva funcionalidad para tener notificaciones en tiempo real. Instalación de bundle "Mercure".