upgrade sofa-common-tools to 1.3.11

sofastack · Jun 1, 2023 · 9d2caef · 9d2caef
1 parent c78cc50
commit 9d2caef
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/...src/test/java/com/alipay/sofa/common/boot/logging/test/GlobalSpaceOverrideConfigTest.java b/...src/test/java/com/alipay/sofa/common/boot/logging/test/GlobalSpaceOverrideConfigTest.java
@@ -45,6 +45,7 @@ public void test() throws IOException {
         Map<String, Object> properties = new HashMap<>();
         properties.put(Constants.SOFA_MIDDLEWARE_ALL_LOG_CONSOLE_SWITCH, "true");
         properties.put(Constants.SOFA_MIDDLEWARE_ALL_LOG_CONSOLE_LEVEL, "debug");
+        properties.put("logging.level.test.space", "info");
         properties
             .put(String.format(Constants.SOFA_MIDDLEWARE_SINGLE_LOG_CONSOLE_SWITCH, TEST_SPACE),
                 "false");
@@ -63,7 +64,7 @@ public void test() throws IOException {
         logger.debug("debug level");
         List<String> contents = FileUtils.readLines(logFile,
             environment.getProperty(Constants.LOG_ENCODING_PROP_KEY));
-        Assert.assertEquals(2, contents.size());
+        Assert.assertEquals(1, contents.size());
         Assert.assertTrue(contents.get(0).contains("info level"));
         Assert.assertFalse(outContent.toString().contains("info level"));
         Assert.assertFalse(outContent.toString().contains("debug level"));

diff --git a/...arter/src/test/java/com/alipay/sofa/common/boot/logging/test/GlobalSpaceOverrideTest.java b/...arter/src/test/java/com/alipay/sofa/common/boot/logging/test/GlobalSpaceOverrideTest.java
@@ -45,6 +45,7 @@ public void test() throws IOException {
         Map<String, Object> properties = new HashMap<>();
         properties.put(Constants.SOFA_MIDDLEWARE_ALL_LOG_CONSOLE_SWITCH, "true");
         properties.put(Constants.SOFA_MIDDLEWARE_ALL_LOG_CONSOLE_LEVEL, "debug");
+        properties.put("logging.level.test.space", "info");
         properties
             .put(String.format(Constants.SOFA_MIDDLEWARE_SINGLE_LOG_CONSOLE_SWITCH, TEST_SPACE),
                 "false");
@@ -63,7 +64,7 @@ public void test() throws IOException {
         logger.debug("debug level");
         List<String> contents = FileUtils.readLines(logFile,
             environment.getProperty(Constants.LOG_ENCODING_PROP_KEY));
-        Assert.assertEquals(2, contents.size());
+        Assert.assertEquals(1, contents.size());
         Assert.assertTrue(contents.get(0).contains("info level"));
         Assert.assertFalse(outContent.toString().contains("info level"));
         Assert.assertFalse(outContent.toString().contains("debug level"));

diff --git a/...-starter/src/test/java/com/alipay/sofa/common/boot/logging/test/GlobbingLogLevelTest.java b/...-starter/src/test/java/com/alipay/sofa/common/boot/logging/test/GlobbingLogLevelTest.java
@@ -47,6 +47,7 @@ public class GlobbingLogLevelTest extends LogTestBase {
     public void test() throws IOException {
         Map<String, Object> properties = new HashMap<>();
         properties.put(Constants.LOG_LEVEL_PREFIX + "test.*", "debug");
+        properties.put("logging.level.test.space", "debug");
         SpringApplication springApplication = new SpringApplication(EmptyConfig.class);
         springApplication.setDefaultProperties(properties);
         ConfigurableApplicationContext applicationContext = springApplication.run();

diff --git a/...ter/src/test/java/com/alipay/sofa/common/boot/logging/test/LogbackConsoleLoggingTest.java b/...ter/src/test/java/com/alipay/sofa/common/boot/logging/test/LogbackConsoleLoggingTest.java
@@ -39,6 +39,7 @@ public void testSpaceConsoleLevelConfig() {
             String.format(Constants.SOFA_MIDDLEWARE_SINGLE_LOG_CONSOLE_SWITCH, TEST_SPACE), "true");
         properties.put(
             String.format(Constants.SOFA_MIDDLEWARE_SINGLE_LOG_CONSOLE_LEVEL, TEST_SPACE), "debug");
+        properties.put("logging.level.test.space", "debug");
         SpringApplication springApplication = new SpringApplication(EmptyConfig.class);
         springApplication.setDefaultProperties(properties);
         springApplication.run();