diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4792332..9729948 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -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' }} jobs: tests-unit: diff --git a/tarantool-shared-resources/logback-test.xml b/tarantool-shared-resources/logback-test.xml index a687cd0..8e248cc 100644 --- a/tarantool-shared-resources/logback-test.xml +++ b/tarantool-shared-resources/logback-test.xml @@ -1,14 +1,17 @@ + + + - + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - + - - + + diff --git a/testcontainers/src/main/java/org/testcontainers/containers/tarantool/config/ConfigurationUtils.java b/testcontainers/src/main/java/org/testcontainers/containers/tarantool/config/ConfigurationUtils.java index 72c0d71..d549261 100644 --- a/testcontainers/src/main/java/org/testcontainers/containers/tarantool/config/ConfigurationUtils.java +++ b/testcontainers/src/main/java/org/testcontainers/containers/tarantool/config/ConfigurationUtils.java @@ -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(), diff --git a/testcontainers/src/test/resources/logback-test.xml b/testcontainers/src/test/resources/logback-test.xml deleted file mode 100644 index 12e2712..0000000 --- a/testcontainers/src/test/resources/logback-test.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - - - -