root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Polish

This commit is contained in:
Phillip Webb 2019-07-30 12:02:41 -07:00 committed by Madhura Bhave
parent 6e1fb5a1c6
commit ea5b624a39
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/logging/LoggingApplicationListener.java
View File

@ -125,8 +125,9 @@ public class LoggingApplicationListener implements GenericApplicationListener {
/** /**
* The name of the {@link LogFile} bean. * The name of the {@link LogFile} bean.
* @since 2.2.0
*/ */
public static final String LOGFILE_BEAN_NAME = "springBootLogFile"; public static final String LOG_FILE_BEAN_NAME = "springBootLogFile";
/** /**
* The name of the{@link LoggerGroups} bean. * The name of the{@link LoggerGroups} bean.
@ -134,6 +135,13 @@ public class LoggingApplicationListener implements GenericApplicationListener {
*/ */
public static final String LOGGER_GROUPS_BEAN_NAME = "springBootLoggerGroups"; public static final String LOGGER_GROUPS_BEAN_NAME = "springBootLoggerGroups";
/**
* The name of the {@link LogFile} bean.
* @deprecated since 2.2.0 in favor of {@link #LOG_FILE_BEAN_NAME}
*/
@Deprecated
public static final String LOGFILE_BEAN_NAME = LOG_FILE_BEAN_NAME;
private static final Map<String, List<String>> DEFAULT_GROUP_LOGGERS; private static final Map<String, List<String>> DEFAULT_GROUP_LOGGERS;
static { static {
MultiValueMap<String, String> loggers = new LinkedMultiValueMap<>(); MultiValueMap<String, String> loggers = new LinkedMultiValueMap<>();
@ -242,8 +250,8 @@ public class LoggingApplicationListener implements GenericApplicationListener {
if (!beanFactory.containsBean(LOGGING_SYSTEM_BEAN_NAME)) { if (!beanFactory.containsBean(LOGGING_SYSTEM_BEAN_NAME)) {
beanFactory.registerSingleton(LOGGING_SYSTEM_BEAN_NAME, this.loggingSystem); beanFactory.registerSingleton(LOGGING_SYSTEM_BEAN_NAME, this.loggingSystem);
} }
if (this.logFile != null && !beanFactory.containsBean(LOGFILE_BEAN_NAME)) { if (this.logFile != null && !beanFactory.containsBean(LOG_FILE_BEAN_NAME)) {
beanFactory.registerSingleton(LOGFILE_BEAN_NAME, this.logFile); beanFactory.registerSingleton(LOG_FILE_BEAN_NAME, this.logFile);
} }
if (this.loggerGroups != null && !beanFactory.containsBean(LOGGER_GROUPS_BEAN_NAME)) { if (this.loggerGroups != null && !beanFactory.containsBean(LOGGER_GROUPS_BEAN_NAME)) {
beanFactory.registerSingleton(LOGGER_GROUPS_BEAN_NAME, this.loggerGroups); beanFactory.registerSingleton(LOGGER_GROUPS_BEAN_NAME, this.loggerGroups);