Fix string Index out of range bug when parse property key. (#43)

Author: QilongZhang

core/src/main/java/com/alipay/sofa/common/log/Constants.java

@@ -77,6 +77,8 @@ public interface Constants {
     String SOFA_MIDDLEWARE_ALL_LOG_CONSOLE_SWITCH                = "sofa.middleware.log.console";
     // single space switch to log on console
     String SOFA_MIDDLEWARE_SINGLE_LOG_CONSOLE_SWITCH             = "sofa.middleware.log.%s.console";
+    // console string
+    String CONSOLE_SUFFIX                                        = ".console";
     // sofa-common-tools 自身日志开关
     // internal log level config.
     String SOFA_MIDDLEWARE_LOG_INTERNAL_LEVEL                    = "sofa.middleware.log.internal.level";

log-sofa-boot-starter/src/main/java/com/alipay/sofa/common/boot/logging/CommonLoggingApplicationListener.java

@@ -59,10 +59,11 @@ public void setReInitialize(boolean value) {
     public void reInitializeLog(Map<String, String> context) {
         for (String key : context.keySet()) {
             if (key.startsWith(Constants.SOFA_MIDDLEWARE_CONFIG_PREFIX)
-                && !key.equals(Constants.SOFA_MIDDLEWARE_ALL_LOG_CONSOLE_SWITCH)) {
+                && !key.equals(Constants.SOFA_MIDDLEWARE_ALL_LOG_CONSOLE_SWITCH)
+                && key.endsWith(Constants.CONSOLE_SUFFIX)) {
                 int index = Constants.SOFA_MIDDLEWARE_CONFIG_PREFIX.length();
                 // minus length of .console
-                int end = key.length() - 8;
+                int end = key.length() - Constants.CONSOLE_SUFFIX.length();
                 String spaceId = key.substring(index, end);
                 LoggerSpaceManager.getLoggerBySpace(spaceId, spaceId);
             }

log-sofa-boot-starter/src/test/java/com/alipay/sofa/common/boot/logging/test/LogIntegrationTest.java

@@ -356,6 +356,24 @@ public void testThreadContextConfiguration() {
         }
     }
 
+    /**
+     * test sofa.middleware.log.disable
+     */
+    @Test
+    public void testDisableMiddleLog() {
+        Map<String, Object> properties = new HashMap<String, Object>();
+        properties.put(Constants.SOFA_MIDDLEWARE_LOG_DISABLE_PROP_KEY, "true");
+        SpringApplication springApplication = new SpringApplication(EmptyConfig.class);
+        springApplication.setDefaultProperties(properties);
+        springApplication.run(new String[] {});
+        logger.info("global space console");
+        logger.debug("global space console debug");
+        Assert.assertFalse(outContent.toString().contains("global space console"));
+        Assert.assertFalse(outContent.toString().contains("global space console debug"));
+        LogEnvUtils.processGlobalSystemLogProperties().remove(
+            Constants.SOFA_MIDDLEWARE_LOG_DISABLE_PROP_KEY);
+    }
+
     protected File getLogbackDefaultFile(Environment environment) {
         String loggingRoot = environment.getProperty(Constants.LOG_PATH_PREFIX + TEST_SPACE);
         if (StringUtil.isBlank(loggingRoot)) {