fix: create logback configuration files for each environment

neumanf · Jan 1, 2025 · d844eb4 · d844eb4
1 parent bc24ef8
commit d844eb4
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,7 +26,7 @@ jobs:
             - name: Run backend
               uses: JarvusInnovations/background-action@v1
               with:
-                run: docker compose -f docker-compose.testing.yml up &
+                run: docker compose -f docker-compose.test.yml up &
                 wait-on: http://localhost:8080/health/
                 wait-for: 10m
 

diff --git a/apps/api/src/main/resources/application.prod.yml b/apps/api/src/main/resources/application.prod.yml
@@ -21,6 +21,9 @@ spring:
                 jwt:
                     issuer-uri: ${KEYCLOAK_ISSUER_URL}
 
+logging:
+  config: classpath:logback-prod.xml
+
 management:
   endpoints:
     web:

diff --git a/...rc/main/resources/application.testing.yml → ...i/src/main/resources/application.test.yml b/...rc/main/resources/application.testing.yml → ...i/src/main/resources/application.test.yml
@@ -21,6 +21,9 @@ spring:
                 jwt:
                     issuer-uri: "http://keycloak:9090/realms/mally"
 
+logging:
+    config: classpath:logback-test.xml
+
 bucket4j:
     enabled: true
     filter-config-caching-enabled: true

diff --git a/apps/api/src/main/resources/application.yml b/apps/api/src/main/resources/application.yml
@@ -21,6 +21,9 @@ spring:
           jwt:
             issuer-uri: "http://localhost:9090/realms/mally"
 
+logging:
+    config: classpath:logback-test.xml
+
 bucket4j:
     enabled: true
     filter-config-caching-enabled: true

diff --git a/...api/src/main/resources/logback-spring.xml → apps/api/src/main/resources/logback-prod.xml b/...api/src/main/resources/logback-spring.xml → apps/api/src/main/resources/logback-prod.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<configuration debug="false">
+<configuration>
     <include resource="org/springframework/boot/logging/logback/defaults.xml" />
     <include resource="org/springframework/boot/logging/logback/console-appender.xml" />
 

diff --git a/apps/api/src/main/resources/logback-test.xml b/apps/api/src/main/resources/logback-test.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <include resource="org/springframework/boot/logging/logback/defaults.xml" />
+    <include resource="org/springframework/boot/logging/logback/console-appender.xml" />
+
+    <property name="CONSOLE_LOG_PATTERN" value="%highlight([%level]) %d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %X{id} %c{1} - %msg%n" />
+
+    <appender name="CONSOLE_APPENDER" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
+            <charset>utf8</charset>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="CONSOLE_APPENDER" />
+    </root>
+</configuration>
diff --git a/apps/api/testing.Dockerfile → apps/api/test.Dockerfile b/apps/api/testing.Dockerfile → apps/api/test.Dockerfile
@@ -14,7 +14,7 @@ FROM eclipse-temurin:21-jre-alpine
 
 ENV ARTIFACT_NAME=api-0.0.1-SNAPSHOT.jar
 ENV APP_HOME=/app
-ENV CONFIGURATION_FILE=application.testing.yml
+ENV CONFIGURATION_FILE=application.test.yml
 
 RUN apk add curl
 

diff --git a/docker-compose.testing.yml → docker-compose.test.yml b/docker-compose.testing.yml → docker-compose.test.yml
@@ -63,7 +63,7 @@ services:
         container_name: mally-api
         build:
             context: .
-            dockerfile: ./apps/api/testing.Dockerfile
+            dockerfile: ./apps/api/test.Dockerfile
         restart: unless-stopped
         networks:
             - mally-network