fix: switch between log type

InseeFr · Dec 18, 2024 · 89aecf5 · 89aecf5
1 parent ddf9536
commit 89aecf5
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 22 deletions.
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
     <description>Modules for queen back-office</description>
 
     <properties>
-        <revision>4.3.22</revision>
+        <revision>4.3.23</revision>
         <changelist></changelist>
         <java.version>21</java.version>
         <maven.compiler.source>21</maven.compiler.source>

diff --git a/queen-application/src/main/resources/application.yml b/queen-application/src/main/resources/application.yml
@@ -113,6 +113,7 @@ management:
       discovery:
         enabled: false
 logging:
+  appender: CONSOLE # CONSOLE | ROLLING_FILE
   level:
     root: INFO
     fr:

diff --git a/queen-application/src/main/resources/logback-spring.xml b/queen-application/src/main/resources/logback-spring.xml
@@ -4,28 +4,22 @@
     <include resource="org/springframework/boot/logging/logback/defaults.xml" />
     <include resource="org/springframework/boot/logging/logback/console-appender.xml" />
 
-    <springProfile name="default,dev,prod">
-        <appender name="ROLLING_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-            <file>${LOG_FILE}</file>
-            <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                <!-- daily rollover -->
-                <fileNamePattern>${LOG_FILE}.%d{yyyy-MM-dd}.log.gz</fileNamePattern>
-                <maxHistory>${LOGBACK_ROLLINGPOLICY_MAX_HISTORY}</maxHistory>
-            </rollingPolicy>
+    <springProperty scope="context" name="logAppender" source="logging.appender" />
 
-            <encoder>
-                <pattern>${FILE_LOG_PATTERN}</pattern>
-            </encoder>
-        </appender>
+    <appender name="ROLLING_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${LOG_FILE}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- daily rollover -->
+            <fileNamePattern>${LOG_FILE}.%d{yyyy-MM-dd}.log.gz</fileNamePattern>
+            <maxHistory>${LOGBACK_ROLLINGPOLICY_MAX_HISTORY}</maxHistory>
+        </rollingPolicy>
 
-        <root level="INFO">
-            <appender-ref ref="ROLLING_FILE" />
-        </root>
-    </springProfile>
+        <encoder>
+            <pattern>${FILE_LOG_PATTERN}</pattern>
+        </encoder>
+    </appender>
 
-    <springProfile name="default,dev,test,prod">
-        <root level="INFO">
-            <appender-ref ref="CONSOLE" />
-        </root>
-    </springProfile>
+    <root level="INFO">
+        <appender-ref ref="${logAppender}" />
+    </root>
 </configuration>
diff --git a/queen-application/src/test/resources/application-test.yml b/queen-application/src/test/resources/application-test.yml
@@ -39,6 +39,7 @@ spring:
     defaultSchema: public
     change-log: classpath:db/integration-test.xml
 logging:
+  appender: CONSOLE
   level:
     root: INFO
     liquibase: ERROR