Spring/spring-boot-data-geode
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixup spring-geode-starter-logging tests based on Spring Boot 2.7 logging (SLF4J, Logback) configuration.

Browse Source
This commit is contained in:
John Blum
2022-10-24 10:15:44 -07:00
parent 5939463466
commit 7e9dca80bb
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/AbstractLoggingIntegrationTests.java
View File

@@ -59,6 +59,7 @@ import ch.qos.logback.core.status.StatusListener;
* @see ch.qos.logback.classic.Logger * @see ch.qos.logback.classic.Logger
* @see ch.qos.logback.classic.LoggerContext * @see ch.qos.logback.classic.LoggerContext
* @see ch.qos.logback.classic.util.ContextInitializer * @see ch.qos.logback.classic.util.ContextInitializer
* @see ch.qos.logback.core.Appender
* @since 1.3.0 * @since 1.3.0
*/ */
@SuppressWarnings("unused") @SuppressWarnings("unused")
@@ -73,8 +74,10 @@ public abstract class AbstractLoggingIntegrationTests {
ch.qos.logback.classic.Logger::getLevel; ch.qos.logback.classic.Logger::getLevel;
protected static final String APACHE_GEODE_LOGGER_NAME = "org.apache.geode"; protected static final String APACHE_GEODE_LOGGER_NAME = "org.apache.geode";
protected static final String CONSOLE_APPENDER_NAME = "CONSOLE"; protected static final String CONSOLE_APPENDER_NAME = "console";
protected static final String DELEGATE_APPENDER_NAME = "delegate"; protected static final String DELEGATE_APPENDER_NAME = "delegate";
protected static final String GEMSTONE_GEMFIRE_LOGGER_NAME = "com.gemstone.gemfire";
protected static final String JGROUPS_LOGGER_NAME = "org.jgroups";
protected static final String SPRING_BOOT_DATA_GEMFIRE_LOG_LEVEL_PROPERTY = "spring.boot.data.gemfire.log.level"; protected static final String SPRING_BOOT_DATA_GEMFIRE_LOG_LEVEL_PROPERTY = "spring.boot.data.gemfire.log.level";
private static TestAppender testAppender; private static TestAppender testAppender;
@@ -179,15 +182,17 @@ public abstract class AbstractLoggingIntegrationTests {
.getStatusManager().add(LoggingStatusListener.create().debug(STATUS_DEBUG_ENABLED)); .getStatusManager().add(LoggingStatusListener.create().debug(STATUS_DEBUG_ENABLED));
logConfiguredLoggers(loggerContext); logConfiguredLoggers(loggerContext);
assertLogbackLoggerConfiguration(loggerContext, assertLogbackLoggerConfiguration(loggerContext,Logger.ROOT_LOGGER_NAME,
Logger.ROOT_LOGGER_NAME, APACHE_GEODE_LOGGER_NAME, "com.gemstone.gemfire", "org.jgroups"); APACHE_GEODE_LOGGER_NAME, GEMSTONE_GEMFIRE_LOGGER_NAME, JGROUPS_LOGGER_NAME);
ch.qos.logback.classic.Logger logbackRootLogger = assertLogbackLogger(loggerContext
.getLogger(Logger.ROOT_LOGGER_NAME), Logger.ROOT_LOGGER_NAME, Level.ERROR);
ch.qos.logback.classic.Logger logbackOrgApacheGeodeLogger = assertLogbackLogger(loggerContext ch.qos.logback.classic.Logger logbackOrgApacheGeodeLogger = assertLogbackLogger(loggerContext
.getLogger(APACHE_GEODE_LOGGER_NAME), APACHE_GEODE_LOGGER_NAME, testLogLevel); .getLogger(APACHE_GEODE_LOGGER_NAME), APACHE_GEODE_LOGGER_NAME, testLogLevel);
logConfiguredAppenders(logbackOrgApacheGeodeLogger); logConfiguredAppenders(logbackRootLogger);
assertLogbackLoggerAppenderConfiguration(logbackOrgApacheGeodeLogger, assertLogbackLoggerAppenderConfiguration(logbackRootLogger, DELEGATE_APPENDER_NAME);
CONSOLE_APPENDER_NAME, DELEGATE_APPENDER_NAME);
} }
catch (Exception cause) { catch (Exception cause) {
throw newIllegalStateException("Failed to configure and initialize SLF4J/Logback", cause); throw newIllegalStateException("Failed to configure and initialize SLF4J/Logback", cause);