Upgrade to Logback 1.5.7

wilkinsona · Aug 16, 2024 · e35bc3e · e35bc3e
1 parent cca5516
commit e35bc3e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -1121,7 +1121,7 @@ bom {
 			releaseNotes("https://github.com/apache/logging-log4j2/releases/tag/rel%2F{version}")
 		}
 	}
-	library("Logback", "1.5.6") {
+	library("Logback", "1.5.7") {
 		group("ch.qos.logback") {
 			modules = [
 				"logback-classic",

diff --git a/...t/src/main/java/org/springframework/boot/logging/logback/DefaultLogbackConfiguration.java b/...t/src/main/java/org/springframework/boot/logging/logback/DefaultLogbackConfiguration.java
@@ -54,7 +54,8 @@ class DefaultLogbackConfiguration {
 	}
 
 	void apply(LogbackConfigurator config) {
-		synchronized (config.getConfigurationLock()) {
+		config.getConfigurationLock().lock();
+		try {
 			defaults(config);
 			Appender<ILoggingEvent> consoleAppender = consoleAppender(config);
 			if (this.logFile != null) {
@@ -65,6 +66,9 @@ void apply(LogbackConfigurator config) {
 				config.root(Level.INFO, consoleAppender);
 			}
 		}
+		finally {
+			config.getConfigurationLock().unlock();
+		}
 	}
 
 	private void defaults(LogbackConfigurator config) {

diff --git a/...ring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackConfigurator.java b/...ring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackConfigurator.java
@@ -18,6 +18,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.locks.ReentrantLock;
 
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.Logger;
@@ -49,7 +50,7 @@ LoggerContext getContext() {
 		return this.context;
 	}
 
-	Object getConfigurationLock() {
+	ReentrantLock getConfigurationLock() {
 		return this.context.getConfigurationLock();
 	}
 

diff --git a/...ing-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java b/...ing-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java
@@ -237,6 +237,7 @@ protected void loadDefaults(LoggingInitializationContext initializationContext,
 					: new LogbackConfigurator(context);
 			new DefaultLogbackConfiguration(logFile).apply(configurator);
 			context.setPackagingDataEnabled(true);
+			context.start();
 		});
 	}
 
@@ -256,6 +257,7 @@ protected void loadConfiguration(LoggingInitializationContext initializationCont
 			catch (Exception ex) {
 				throw new IllegalStateException("Could not initialize Logback logging from " + location, ex);
 			}
+			loggerContext.start();
 		});
 		reportConfigurationErrorsIfNecessary(loggerContext);
 	}

diff --git a/.../test/java/org/springframework/boot/logging/logback/SpringBootJoranConfiguratorTests.java b/.../test/java/org/springframework/boot/logging/logback/SpringBootJoranConfiguratorTests.java
@@ -73,6 +73,7 @@ void setup(CapturedOutput output) {
 	void reset() {
 		this.context.stop();
 		new BasicConfigurator().configure((LoggerContext) LoggerFactory.getILoggerFactory());
+		this.context.start();
 	}
 
 	@Test