mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-07-05 00:56:58 +08:00
Merge branch '3.1.x'
Closes gh-37485
This commit is contained in:
commit
b87e47e90c
|
@ -43,6 +43,7 @@ import org.slf4j.Logger;
|
|||
import org.slf4j.LoggerFactory;
|
||||
import org.slf4j.Marker;
|
||||
import org.slf4j.bridge.SLF4JBridgeHandler;
|
||||
import org.slf4j.helpers.SubstituteLoggerFactory;
|
||||
|
||||
import org.springframework.aot.AotDetector;
|
||||
import org.springframework.beans.factory.aot.BeanFactoryInitializationAotContribution;
|
||||
|
@ -386,7 +387,7 @@ public class LogbackLoggingSystem extends AbstractLoggingSystem implements BeanF
|
|||
}
|
||||
|
||||
private LoggerContext getLoggerContext() {
|
||||
ILoggerFactory factory = LoggerFactory.getILoggerFactory();
|
||||
ILoggerFactory factory = getLoggerFactory();
|
||||
Assert.isInstanceOf(LoggerContext.class, factory,
|
||||
() -> String.format(
|
||||
"LoggerFactory is not a Logback LoggerContext but Logback is on "
|
||||
|
@ -398,6 +399,21 @@ public class LogbackLoggingSystem extends AbstractLoggingSystem implements BeanF
|
|||
return (LoggerContext) factory;
|
||||
}
|
||||
|
||||
private ILoggerFactory getLoggerFactory() {
|
||||
ILoggerFactory factory = LoggerFactory.getILoggerFactory();
|
||||
while (factory instanceof SubstituteLoggerFactory) {
|
||||
try {
|
||||
Thread.sleep(50);
|
||||
}
|
||||
catch (InterruptedException ex) {
|
||||
Thread.currentThread().interrupt();
|
||||
throw new IllegalStateException("Interrupted while waiting for non-subtitute logger factory", ex);
|
||||
}
|
||||
factory = LoggerFactory.getILoggerFactory();
|
||||
}
|
||||
return factory;
|
||||
}
|
||||
|
||||
private Object getLocation(ILoggerFactory factory) {
|
||||
try {
|
||||
ProtectionDomain protectionDomain = factory.getClass().getProtectionDomain();
|
||||
|
|
|
@ -0,0 +1,76 @@
|
|||
/*
|
||||
* Copyright 2012-2023 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.boot.logging.logback;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.CopyOnWriteArrayList;
|
||||
|
||||
import ch.qos.logback.classic.LoggerContext;
|
||||
import org.junit.jupiter.api.AfterEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import org.springframework.boot.logging.LoggingSystem;
|
||||
import org.springframework.boot.testsupport.classpath.ForkedClassPath;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
/**
|
||||
* Tests for parallel initialization of {@link LogbackLoggingSystem} that are separate
|
||||
* from {@link LogbackLoggingSystemTests}. This isolation allows them to have complete
|
||||
* control over how and when the logging system is initialized.
|
||||
*
|
||||
* @author Andy Wilkinson
|
||||
*/
|
||||
class LogbackLoggingSystemParallelInitializationTests {
|
||||
|
||||
private final LoggingSystem loggingSystem = LoggingSystem
|
||||
.get(LogbackLoggingSystemParallelInitializationTests.class.getClassLoader());
|
||||
|
||||
@AfterEach
|
||||
void cleanUp() {
|
||||
this.loggingSystem.cleanUp();
|
||||
((LoggerContext) LoggerFactory.getILoggerFactory()).stop();
|
||||
}
|
||||
|
||||
@Test
|
||||
@ForkedClassPath
|
||||
void noExceptionsAreThrownWhenBeforeInitializeIsCalledInParallel() {
|
||||
List<Thread> threads = new ArrayList<>();
|
||||
List<Throwable> exceptions = new CopyOnWriteArrayList<>();
|
||||
for (int i = 0; i < 10; i++) {
|
||||
Thread thread = new Thread(() -> this.loggingSystem.beforeInitialize());
|
||||
thread.setUncaughtExceptionHandler((t, ex) -> exceptions.add(ex));
|
||||
threads.add(thread);
|
||||
}
|
||||
threads.forEach(Thread::start);
|
||||
threads.forEach(this::join);
|
||||
assertThat(exceptions).isEmpty();
|
||||
}
|
||||
|
||||
private void join(Thread thread) {
|
||||
try {
|
||||
thread.join();
|
||||
}
|
||||
catch (InterruptedException ex) {
|
||||
Thread.currentThread().interrupt();
|
||||
throw new RuntimeException(ex);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
|
@ -10,6 +10,7 @@
|
|||
<suppress files="LogbackInitializer\.java" checks="IllegalImport" />
|
||||
<suppress files="LogbackLoggingSystem\.java" checks="IllegalImport" />
|
||||
<suppress files="LogbackLoggingSystemTests\.java" checks="IllegalImport" />
|
||||
<suppress files="LogbackLoggingSystemParallelInitializationTests\.java" checks="IllegalImport" />
|
||||
<suppress files="LogbackConfigurationAotContributionTests\.java" checks="IllegalImport" />
|
||||
<suppress files="MetricsAutoConfigurationMeterRegistryPostProcessorIntegrationTests\.java" checks="IllegalImport" message="LoggerFactory"/>
|
||||
<suppress files="SpringApplicationTests\.java" checks="FinalClass" />
|
||||
|
|
Loading…
Reference in New Issue
Block a user