feat(core): use a standard logger for unit test

kestra-io · Jun 21, 2024 · 2b33399 · 2b33399
1 parent f3b711c
commit 2b33399
Show file tree

Hide file tree

Showing 14 changed files with 21 additions and 8 deletions.
diff --git a/cli/src/main/java/io/kestra/cli/commands/sys/database/DatabaseMigrateCommand.java b/cli/src/main/java/io/kestra/cli/commands/sys/database/DatabaseMigrateCommand.java
@@ -14,13 +14,6 @@
 )
 @Slf4j
 public class DatabaseMigrateCommand extends AbstractCommand {
-
-    static {
-        // Force enable Flyway logs
-        ch.qos.logback.classic.Logger flywayLogger = (ch.qos.logback.classic.Logger) org.slf4j.LoggerFactory.getLogger("org.flywaydb");
-        flywayLogger.setLevel(Level.INFO);
-    }
-
     @Override
     public Integer call() throws Exception {
         // Flyway will run automatically

diff --git a/cli/src/test/resources/logback.xml b/cli/src/test/resources/logback.xml
@@ -2,6 +2,7 @@
 <configuration debug="false">
     <include resource="logback/base.xml" />
     <include resource="logback/text.xml" />
+    <include resource="logback/test.xml" />
 
     <root level="WARN">
         <appender-ref ref="STDOUT" />

diff --git a/core/src/main/resources/logback/base.xml b/core/src/main/resources/logback/base.xml
@@ -36,7 +36,7 @@
         We enable INFO for DbMigrate otherwise there is nothing displayed on the console when a migration is ongoing,
         which can be make thinking Kestra is not starting when the migration is long.
     -->
-    <logger name="org.flywaydb.core.internal.command.DbMigrate" level="INFO" />
+    <logger name="org.flywaydb" level="INFO" />
     <!-- Flyway log when using IF NOT EXISTS -->
     <logger name="org.flywaydb.core.internal.sqlscript.DefaultSqlScriptExecutor" level="ERROR" />
 </included>
diff --git a/core/src/main/resources/logback/test.xml b/core/src/main/resources/logback/test.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<included>
+    <logger name="org.flywaydb" level="WARN" />
+    <logger name="io.kestra.core.plugins.PluginScanner" level="WARN" />
+    <logger name="org.flywaydb.core.internal.database.base.Database" level="ERROR" />
+
+    <logger name="io.kestra" level="INFO" />
+    <logger name="flow" level="INFO" />
+</included>
diff --git a/core/src/test/resources/logback.xml b/core/src/test/resources/logback.xml
@@ -2,6 +2,7 @@
 <configuration debug="false">
     <include resource="logback/base.xml" />
     <include resource="logback/text.xml" />
+    <include resource="logback/test.xml" />
 
     <root level="WARN">
         <appender-ref ref="STDOUT" />

diff --git a/jdbc-h2/src/test/resources/logback.xml b/jdbc-h2/src/test/resources/logback.xml
@@ -2,6 +2,7 @@
 <configuration debug="false">
     <include resource="logback/base.xml" />
     <include resource="logback/text.xml" />
+    <include resource="logback/test.xml" />
 
     <root level="WARN">
         <appender-ref ref="STDOUT" />

diff --git a/jdbc-mysql/src/test/resources/logback.xml b/jdbc-mysql/src/test/resources/logback.xml
@@ -2,6 +2,7 @@
 <configuration debug="false">
     <include resource="logback/base.xml" />
     <include resource="logback/text.xml" />
+    <include resource="logback/test.xml" />
 
     <root level="WARN">
         <appender-ref ref="STDOUT" />

diff --git a/jdbc-postgres/src/test/resources/logback.xml b/jdbc-postgres/src/test/resources/logback.xml
@@ -2,6 +2,7 @@
 <configuration debug="false">
     <include resource="logback/base.xml" />
     <include resource="logback/text.xml" />
+    <include resource="logback/test.xml" />
 
     <root level="WARN">
         <appender-ref ref="STDOUT" />

diff --git a/jdbc/src/test/resources/logback.xml b/jdbc/src/test/resources/logback.xml
@@ -2,6 +2,7 @@
 <configuration debug="false">
     <include resource="logback/base.xml" />
     <include resource="logback/text.xml" />
+    <include resource="logback/test.xml" />
 
     <root level="WARN">
         <appender-ref ref="STDOUT" />

diff --git a/processor/src/test/resources/logback.xml b/processor/src/test/resources/logback.xml
@@ -2,6 +2,7 @@
 <configuration debug="false">
     <include resource="logback/base.xml" />
     <include resource="logback/text.xml" />
+    <include resource="logback/test.xml" />
 
     <root level="WARN">
         <appender-ref ref="STDOUT" />

diff --git a/repository-memory/src/test/resources/logback.xml b/repository-memory/src/test/resources/logback.xml
@@ -2,6 +2,7 @@
 <configuration debug="false">
     <include resource="logback/base.xml" />
     <include resource="logback/text.xml" />
+    <include resource="logback/test.xml" />
 
     <root level="WARN">
         <appender-ref ref="STDOUT" />

diff --git a/runner-memory/src/test/resources/logback.xml b/runner-memory/src/test/resources/logback.xml
@@ -2,6 +2,7 @@
 <configuration debug="false">
     <include resource="logback/base.xml" />
     <include resource="logback/text.xml" />
+    <include resource="logback/test.xml" />
 
     <root level="WARN">
         <appender-ref ref="STDOUT" />

diff --git a/storage-local/src/test/resources/logback.xml b/storage-local/src/test/resources/logback.xml
@@ -2,6 +2,7 @@
 <configuration debug="false">
     <include resource="logback/base.xml" />
     <include resource="logback/text.xml" />
+    <include resource="logback/test.xml" />
 
     <root level="WARN">
         <appender-ref ref="STDOUT" />

diff --git a/webserver/src/test/resources/logback.xml b/webserver/src/test/resources/logback.xml
@@ -2,6 +2,7 @@
 <configuration debug="false">
     <include resource="logback/base.xml" />
     <include resource="logback/text.xml" />
+    <include resource="logback/test.xml" />
 
     <root level="WARN">
         <appender-ref ref="STDOUT" />