From 1338a57ce5804b949ac8bf83c63e7e273815c61f Mon Sep 17 00:00:00 2001 From: Arthur de Moulins Date: Tue, 3 Dec 2024 09:57:41 +0100 Subject: [PATCH 1/2] fix TerminateStackListener --- lib/php/messenger-bundle/Listener/TerminateStackListener.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/php/messenger-bundle/Listener/TerminateStackListener.php b/lib/php/messenger-bundle/Listener/TerminateStackListener.php index cac5909f0..123d42a5e 100644 --- a/lib/php/messenger-bundle/Listener/TerminateStackListener.php +++ b/lib/php/messenger-bundle/Listener/TerminateStackListener.php @@ -7,10 +7,12 @@ use Symfony\Component\Console\ConsoleEvents; use Symfony\Component\EventDispatcher\Attribute\AsEventListener; use Symfony\Component\HttpKernel\KernelEvents; +use Symfony\Component\Messenger\Event\WorkerMessageHandledEvent; use Symfony\Component\Messenger\MessageBusInterface; #[AsEventListener(KernelEvents::TERMINATE, 'onTerminate')] #[AsEventListener(ConsoleEvents::TERMINATE, 'onTerminate')] +#[AsEventListener(WorkerMessageHandledEvent::class, method: 'onTerminate')] final class TerminateStackListener { private array $callbacks = []; From bf36a799401f251749f79c9fd5183944fab87d4f Mon Sep 17 00:00:00 2001 From: Arthur de Moulins Date: Tue, 3 Dec 2024 10:40:35 +0100 Subject: [PATCH 2/2] github fixes --- infra/docker/nginx-cache-purge/Dockerfile | 4 ++-- infra/docker/report-elk/logstash/Dockerfile | 2 +- report/Dockerfile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/infra/docker/nginx-cache-purge/Dockerfile b/infra/docker/nginx-cache-purge/Dockerfile index 75f7f748a..5b0607344 100644 --- a/infra/docker/nginx-cache-purge/Dockerfile +++ b/infra/docker/nginx-cache-purge/Dockerfile @@ -3,9 +3,9 @@ ARG NGINX_VERSION=1.20.1 FROM nginx:${NGINX_VERSION}-alpine AS builder # nginx:alpine contains NGINX_VERSION environment variable, like so: -# ENV NGINX_VERSION 1.15.0 +# ENV NGINX_VERSION=1.15.0 -ENV PURGE_CACHE_VERSION 2.3 +ENV PURGE_CACHE_VERSION=2.3 # Download sources RUN mkdir -p /usr/src \ diff --git a/infra/docker/report-elk/logstash/Dockerfile b/infra/docker/report-elk/logstash/Dockerfile index bfed1ca8b..923f08cd7 100644 --- a/infra/docker/report-elk/logstash/Dockerfile +++ b/infra/docker/report-elk/logstash/Dockerfile @@ -13,4 +13,4 @@ COPY ./config/logstash.yml /usr/share/logstash/config/logstash.yml COPY ./files/report.sql /usr/share/logstash/files/report.sql COPY ./pipeline/logstash.conf /usr/share/logstash/pipeline/logstash.conf -ENV ELASTICSEARCH_HOST elasticsearch-report:9200 +ENV ELASTICSEARCH_HOST=elasticsearch-report:9200 diff --git a/report/Dockerfile b/report/Dockerfile index efbe3297b..3ac0dcd07 100644 --- a/report/Dockerfile +++ b/report/Dockerfile @@ -16,4 +16,4 @@ RUN go build -o app . \ EXPOSE 80 -CMD ./go.sh +CMD ["./go.sh"]