Skip to content

Commit

Permalink
feat(core): use a standard logger for unit test
Browse files Browse the repository at this point in the history
  • Loading branch information
tchiotludo committed Jun 21, 2024
1 parent f3b711c commit e9f8a8f
Show file tree
Hide file tree
Showing 15 changed files with 25 additions and 24 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions cli/src/test/resources/logback.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/resources/logback/base.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
9 changes: 9 additions & 0 deletions core/src/main/resources/logback/test.xml
Original file line number Diff line number Diff line change
@@ -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>
1 change: 1 addition & 0 deletions core/src/test/resources/logback.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
1 change: 1 addition & 0 deletions jdbc-h2/src/test/resources/logback.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
1 change: 1 addition & 0 deletions jdbc-mysql/src/test/resources/logback.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
1 change: 1 addition & 0 deletions jdbc-postgres/src/test/resources/logback.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
1 change: 1 addition & 0 deletions jdbc/src/test/resources/logback.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
1 change: 1 addition & 0 deletions processor/src/test/resources/logback.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
1 change: 1 addition & 0 deletions repository-memory/src/test/resources/logback.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
1 change: 1 addition & 0 deletions runner-memory/src/test/resources/logback.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
20 changes: 4 additions & 16 deletions script/src/test/resources/logback.xml
Original file line number Diff line number Diff line change
@@ -1,23 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration debug="false">
<statusListener class="ch.qos.logback.core.status.NopStatusListener" />
<property name="pattern" value="%d{ISO8601} %highlight(%-5.5level) %magenta(%-12.12thread) %cyan(%-12.12logger{12}) %msg%n" />
<withJansi>true</withJansi>

<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<target>System.out</target>
<immediateFlush>true</immediateFlush>
<encoder>
<pattern>${pattern}</pattern>
</encoder>
</appender>

<include resource="logback/base.xml" />
<include resource="logback/text.xml" />
<include resource="logback/test.xml" />

<root level="WARN">
<appender-ref ref="STDOUT" />
<appender-ref ref="STDERR" />
</root>

<logger name="io.kestra" level="INFO" />
<logger name="flow" level="INFO" />

</configuration>
1 change: 1 addition & 0 deletions storage-local/src/test/resources/logback.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
1 change: 1 addition & 0 deletions webserver/src/test/resources/logback.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down

0 comments on commit e9f8a8f

Please sign in to comment.