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 675034b287c8d13675870e93fce9ecbdafec30a9..be53dd24874be44f4f4e29a6e10d73c8fc8c4776 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 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 655c5ceeb535d5ce625eac747a88cec20625b349..ddbb9bc2fdd6e933b11975e32542f49a0bc3b081 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 5b5c34cc2ea3ec98590e9ed07461c161f26bc8bb..5a980e9bf32fbe9488a8f3973a782af5994e4f50 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",