From 06e3c6088316f13c9811319b6c202f7d48075fde Mon Sep 17 00:00:00 2001 From: gibert Date: Tue, 30 Apr 2024 11:43:02 +0200 Subject: [PATCH 1/4] ajout creation image Dockerhub --- .github/workflows/build-test-pubtodockerhub.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-test-pubtodockerhub.yml b/.github/workflows/build-test-pubtodockerhub.yml index 1ae4b1b..432ee24 100644 --- a/.github/workflows/build-test-pubtodockerhub.yml +++ b/.github/workflows/build-test-pubtodockerhub.yml @@ -36,11 +36,11 @@ jobs: with: images: ${{ env.DOCKERHUB_IMAGE_PREFIX }} - name: "Push: login to DockerHub" - if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/tags/')) + if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/test' || startsWith(github.ref, 'refs/tags/')) run: | echo "${{ secrets.DOCKERHUB_TOKEN }}" | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin - name: "Push: push docker image" - if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/tags/')) + if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/test' || startsWith(github.ref, 'refs/tags/')) run: | DOCKER_TAGS="${{ steps.docker_tag_meta.outputs.tags }}" for DOCKER_TAG in $DOCKER_TAGS From a498d1fea79fef31556751d10588a4232602833b Mon Sep 17 00:00:00 2001 From: gibert Date: Tue, 30 Apr 2024 15:19:02 +0200 Subject: [PATCH 2/4] ajout mode maintenance --- .../export/filters/MaintenanceFilter.java | 32 +++++++++++++++++++ src/main/resources/application.properties | 3 ++ 2 files changed, 35 insertions(+) create mode 100644 src/main/java/fr/abes/theses/export/filters/MaintenanceFilter.java diff --git a/src/main/java/fr/abes/theses/export/filters/MaintenanceFilter.java b/src/main/java/fr/abes/theses/export/filters/MaintenanceFilter.java new file mode 100644 index 0000000..9bebedd --- /dev/null +++ b/src/main/java/fr/abes/theses/export/filters/MaintenanceFilter.java @@ -0,0 +1,32 @@ +package fr.abes.theses.export.filters; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.core.annotation.Order; +import org.springframework.stereotype.Component; + +import javax.servlet.*; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +@Component +@Order(1) +public class MaintenanceFilter implements Filter { + + @Value("${maintenance}") + private boolean isMaintenance; + + @Value("${maintenance.message}") + private String maintenanceMsg; + + @Override + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { + HttpServletResponse httpResponse = (HttpServletResponse) response; + + if (isMaintenance) { + httpResponse.setStatus(HttpServletResponse.SC_SERVICE_UNAVAILABLE); + httpResponse.getWriter().write(maintenanceMsg); + } else { + chain.doFilter(request, response); + } + } +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index feef1f3..6a9a0a0 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -13,3 +13,6 @@ path.xsls= logging.level.fr.abes= racine= + +maintenance=false +maintenance.message=Service en maintenance. Veuillez reessayer plus tard. \ No newline at end of file From d990d83d267abc89d5b2d0075efc69d0bbd4b3ad Mon Sep 17 00:00:00 2001 From: gibert Date: Tue, 30 Apr 2024 15:47:25 +0200 Subject: [PATCH 3/4] ajout variables mode maintenance --- src/main/resources/application.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 6a9a0a0..02265e6 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -14,5 +14,5 @@ path.xsls= logging.level.fr.abes= racine= -maintenance=false -maintenance.message=Service en maintenance. Veuillez reessayer plus tard. \ No newline at end of file +maintenance.export=false +maintenance.export.message=Service en maintenance. Veuillez reessayer plus tard. \ No newline at end of file From ca8e6ac3cf2ce6de6d7ae6ce21a25b2954ca1143 Mon Sep 17 00:00:00 2001 From: gibert Date: Tue, 30 Apr 2024 16:14:47 +0200 Subject: [PATCH 4/4] modif variables mode maintenance --- src/main/resources/application.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 02265e6..6a9a0a0 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -14,5 +14,5 @@ path.xsls= logging.level.fr.abes= racine= -maintenance.export=false -maintenance.export.message=Service en maintenance. Veuillez reessayer plus tard. \ No newline at end of file +maintenance=false +maintenance.message=Service en maintenance. Veuillez reessayer plus tard. \ No newline at end of file