Bladeren bron

SONAR-21227 Expose deprecation.log to console

tags/10.4.0.87286
Jacek Poreda 4 maanden geleden
bovenliggende
commit
8fd8c030e7

+ 3
- 0
server/sonar-webserver-core/src/main/java/org/sonar/server/app/WebServerProcessLogging.java Bestand weergeven

@@ -23,6 +23,7 @@ import ch.qos.logback.classic.Level;
import ch.qos.logback.classic.Logger;
import ch.qos.logback.classic.LoggerContext;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.ConsoleAppender;
import ch.qos.logback.core.FileAppender;
import ch.qos.logback.core.encoder.Encoder;
import org.sonar.process.ProcessId;
@@ -80,10 +81,12 @@ public class WebServerProcessLogging extends ServerProcessLogging {
: helper.createPatternLayoutEncoder(context, buildDepractedLogPatrern(config));

FileAppender<ILoggingEvent> appender = helper.newFileAppender(context, props, DEPRECATION_LOG_FILE_PREFIX, encoder);
ConsoleAppender<ILoggingEvent> consoleAppender = helper.newConsoleAppender(context, "CONSOLE", encoder);

Logger deprecated = context.getLogger(DEPRECATION_LOGGER_NAME);
deprecated.setAdditive(false);
deprecated.addAppender(appender);
deprecated.addAppender(consoleAppender);
}

private static String buildDepractedLogPatrern(RootLoggerConfig config) {

+ 9
- 0
server/sonar-webserver-core/src/test/java/org/sonar/server/app/WebServerProcessLoggingTest.java Bestand weergeven

@@ -558,6 +558,15 @@ public class WebServerProcessLoggingTest {
assertThat(fileAppender.getEncoder()).isInstanceOf(LayoutWrappingEncoder.class);
}

@Test
public void configure_shouldConfigureDeprecatedLoggerWithConsoleAppender() {
LoggerContext ctx = underTest.configure(props);

Logger root = ctx.getLogger("SONAR_DEPRECATION");
Appender<ILoggingEvent> appender = root.getAppender("CONSOLE");
assertThat(appender).isNotNull();
}

private void verifyRootLogLevel(LoggerContext ctx, Level expected) {
Logger rootLogger = ctx.getLogger(ROOT_LOGGER_NAME);
assertThat(rootLogger.getLevel()).isEqualTo(expected);

Laden…
Annuleren
Opslaan