Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ env:
TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX: "registry.ps.tarantool.io/"
# Переменная, используемая в тестах в качестве префикса к названию образа. Переопределяется локально, если необходимо
TARANTOOL_REGISTRY: "registry.ps.tarantool.io/"
# Оперделим, включать ли логи для тестов
LOGBACK_LEVEL: ${{ secrets.ACTIONS_STEP_DEBUG == 'true' && 'INFO' || 'OFF' }}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Здесь можно оставить уровень константно в INFO


jobs:
tests-unit:
Expand Down
11 changes: 7 additions & 4 deletions tarantool-shared-resources/logback-test.xml
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
<configuration debug="false">

<property name="LEVEL" value="${LOGBACK_LEVEL:-INFO}"/>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Давай напишем об этих изменениях в Changelog.
Т.к. мы меняем поведение библиотеки.


<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
</encoder>
</appender>

<root level="INFO">
<root level="${LEVEL}">
<appender-ref ref="STDOUT"/>
</root>
<logger name="org.springframework" level="INFO"/>
<logger name="org.testcontainers" level="INFO"/>
<logger name="org.springframework" level="${LEVEL}"/>
<logger name="org.testcontainers" level="${LEVEL}"/>
<!-- <logger name="com.github.dockerjava" level="DEBUG"/> -->
</configuration>
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ public static void bootstrap(
.append(":")
.append(uri.getPort());

LOGGER.info("Start cluster bootstrap in '{}' container", router);
LOGGER.info("Start cluster bootstrap in '{}' container", router.node());
try {
Unreliables.retryUntilSuccess(
(int) bootstrapTimeout.getSeconds(),
Expand Down
15 changes: 0 additions & 15 deletions testcontainers/src/test/resources/logback-test.xml

This file was deleted.

Loading