From 37664e38ca7d73ac06d571761154ea1137a0b31e Mon Sep 17 00:00:00 2001
From: liaozan <378024053@qq.com>
Date: Tue, 2 May 2023 15:10:20 +0800
Subject: [PATCH] Replace logfile namespace constants with configuration

---
 .../listener/LoggerPropertiesPreparedEventListener.java  | 9 +++++----
 .../logger/properties/LoggerProperties.java              | 2 ++
 .../META-INF/spring-configuration-metadata.json          | 6 ++++++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/listener/LoggerPropertiesPreparedEventListener.java b/starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/listener/LoggerPropertiesPreparedEventListener.java
index 675034b..be53dd2 100644
--- a/starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/listener/LoggerPropertiesPreparedEventListener.java
+++ b/starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/listener/LoggerPropertiesPreparedEventListener.java
@@ -1,5 +1,6 @@
 package com.schbrain.framework.autoconfigure.logger.listener;
 
+import cn.hutool.core.text.StrPool;
 import cn.hutool.system.SystemUtil;
 import com.ctrip.framework.apollo.ConfigFile;
 import com.ctrip.framework.apollo.ConfigService;
@@ -31,7 +32,7 @@ public class LoggerPropertiesPreparedEventListener extends PropertiesPreparedEve
         ConfigurableEnvironment environment = event.getEnvironment();
         Map<String, String> hostInfoProperties = buildHostInfoProperties();
         event.getPropertySource().addProperties(hostInfoProperties);
-        configLoggingFileLocation(environment);
+        configLoggingFileLocation(environment, properties.getLogConfigNamespace());
         new LoggerConfigurationInitializer(environment, properties).init();
     }
 
@@ -49,11 +50,11 @@ public class LoggerPropertiesPreparedEventListener extends PropertiesPreparedEve
      * @see org.springframework.boot.context.logging.LoggingApplicationListener#initializeSystem(ConfigurableEnvironment, org.springframework.boot.logging.LoggingSystem, org.springframework.boot.logging.LogFile)
      */
     @SuppressWarnings("JavadocReference")
-    private void configLoggingFileLocation(ConfigurableEnvironment environment) {
+    private void configLoggingFileLocation(ConfigurableEnvironment environment, String logConfigNamespace) {
         if (environment.containsProperty(CONFIG_PROPERTY)) {
             return;
         }
-        ConfigFile loggingConfiguration = ConfigService.getConfigFile("logback-spring", ConfigFileFormat.XML);
+        ConfigFile loggingConfiguration = ConfigService.getConfigFile(logConfigNamespace, ConfigFileFormat.XML);
         String content = loggingConfiguration.getContent();
         if (!StringUtils.hasText(content)) {
             log.warn("empty logging configuration, reinitialize loggingSystem is disabled");
@@ -62,7 +63,7 @@ public class LoggerPropertiesPreparedEventListener extends PropertiesPreparedEve
 
         String loggerConfigurationLocation = null;
         String tempDir = SystemUtil.getUserInfo().getTempDir();
-        Path storeLocation = Paths.get(tempDir, "logback-spring.xml");
+        Path storeLocation = Paths.get(tempDir, logConfigNamespace + StrPool.DOT + ConfigFileFormat.XML.getValue());
         try {
             loggerConfigurationLocation = Files.writeString(storeLocation, content).toString();
         } catch (IOException e) {
diff --git a/starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/properties/LoggerProperties.java b/starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/properties/LoggerProperties.java
index 655c5ce..ddbb9bc 100644
--- a/starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/properties/LoggerProperties.java
+++ b/starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/properties/LoggerProperties.java
@@ -27,6 +27,8 @@ public class LoggerProperties extends ConfigurableProperties implements Priority
 
     private String logstashAddress;
 
+    private String logConfigNamespace = "logback-spring";
+
     private String logPath = DEFAULT_LOG_PATH;
 
     private int maxHistory = (int) Duration.ofDays(30).toDays();
diff --git a/starters/logger-spring-boot-starter/src/main/resources/META-INF/spring-configuration-metadata.json b/starters/logger-spring-boot-starter/src/main/resources/META-INF/spring-configuration-metadata.json
index 5b5c34c..5a980e9 100644
--- a/starters/logger-spring-boot-starter/src/main/resources/META-INF/spring-configuration-metadata.json
+++ b/starters/logger-spring-boot-starter/src/main/resources/META-INF/spring-configuration-metadata.json
@@ -25,6 +25,12 @@
       "sourceType": "com.schbrain.framework.autoconfigure.logger.properties.LoggerProperties",
       "defaultValue": false
     },
+    {
+      "name": "schbrain.logging.file.log-config-namespace",
+      "type": "java.lang.String",
+      "sourceType": "com.schbrain.framework.autoconfigure.logger.properties.LoggerProperties",
+      "defaultValue": "logback-spring"
+    },
     {
       "name": "schbrain.logging.file.log-path",
       "type": "java.lang.String",
-- 
GitLab