From a10bfc153dc39bb07b0a29d92161159e2dae9139 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 4 Aug 2015 15:23:36 -0700 Subject: [PATCH] Restore LoggingSystem 1.2.x compatibility Restore and deprecate the previous `initialize` method to allow a migration path. Fixes gh-3591 --- .../boot/logging/LoggingSystem.java | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystem.java b/spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystem.java index 0e34fae969..b94f1c7894 100644 --- a/spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystem.java +++ b/spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystem.java @@ -66,8 +66,23 @@ public abstract class LoggingSystem { * @param logFile the log output file that should be written or {@code null} for * console only output */ - public abstract void initialize(LoggingInitializationContext initializationContext, - String configLocation, LogFile logFile); + public void initialize(LoggingInitializationContext initializationContext, + String configLocation, LogFile logFile) { + initialize(configLocation, logFile); + } + + /** + * Fully initialize the logging system. + * @param configLocation a log configuration location or {@code null} if default + * initialization is required + * @param logFile the log output file that should be written or {@code null} for + * console only output + * @deprecated since 1.3 in favor of + * {@link #initialize(LoggingInitializationContext, String, LogFile)} + */ + @Deprecated + public void initialize(String configLocation, LogFile logFile) { + } /** * Clean up the logging system. The default implementation does nothing. Subclasses