Repository: camel Updated Branches: refs/heads/master d17061ad4 -> f7f401933
CAMEL-10118: Overriding module logger in main class Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8b4f772e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8b4f772e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8b4f772e Branch: refs/heads/master Commit: 8b4f772e9a86d3a97a036e2f55e3b825b11a23d2 Parents: d17061a Author: Nicola Ferraro <ni.ferr...@gmail.com> Authored: Mon Jul 4 16:18:59 2016 +0200 Committer: Nicola Ferraro <ni.ferr...@gmail.com> Committed: Mon Jul 4 16:18:59 2016 +0200 ---------------------------------------------------------------------- .../itest/springboot/ITestApplication.java | 32 ++++++++++++++++++++ .../springboot/command/UnitTestCommand.java | 29 ------------------ 2 files changed, 32 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/8b4f772e/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestApplication.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestApplication.java b/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestApplication.java index 47aca42..036510b 100644 --- a/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestApplication.java +++ b/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestApplication.java @@ -16,6 +16,14 @@ */ package org.apache.camel.itest.springboot; +import java.net.URL; + +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.joran.JoranConfigurator; +import ch.qos.logback.core.joran.spi.JoranException; +import ch.qos.logback.core.util.StatusPrinter; + +import org.slf4j.LoggerFactory; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.scheduling.annotation.EnableAsync; @@ -29,6 +37,8 @@ import org.springframework.scheduling.annotation.EnableAsync; public class ITestApplication { public static void main(String[] args) throws Exception { + overrideLoggingConfig(); + SpringApplication.run(ITestApplication.class, args); } @@ -38,4 +48,26 @@ public class ITestApplication { return "spring-boot-main"; } + private static void overrideLoggingConfig() { + + URL logbackFile = ITestApplication.class.getResource("/spring-logback.xml"); + if (logbackFile != null) { + + LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory(); + + try { + JoranConfigurator configurator = new JoranConfigurator(); + configurator.setContext(context); + // Call context.reset() to clear any previous configuration, e.g. default + // configuration. For multi-step configuration, omit calling context.reset(). + context.reset(); + configurator.doConfigure(logbackFile); + } catch (JoranException je) { + // StatusPrinter will handle this + } + StatusPrinter.printInCaseOfErrorsOrWarnings(context); + } + + } + } http://git-wip-us.apache.org/repos/asf/camel/blob/8b4f772e/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/command/UnitTestCommand.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/command/UnitTestCommand.java b/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/command/UnitTestCommand.java index b7bf02e..9d917b6 100644 --- a/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/command/UnitTestCommand.java +++ b/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/command/UnitTestCommand.java @@ -29,11 +29,6 @@ import javax.management.MBeanServer; import javax.management.MBeanServerFactory; import javax.management.ObjectName; -import ch.qos.logback.classic.LoggerContext; -import ch.qos.logback.classic.joran.JoranConfigurator; -import ch.qos.logback.core.joran.spi.JoranException; -import ch.qos.logback.core.util.StatusPrinter; - import org.apache.camel.CamelContext; import org.apache.camel.itest.springboot.Command; import org.apache.camel.itest.springboot.ITestConfig; @@ -65,8 +60,6 @@ public class UnitTestCommand extends AbstractTestCommand implements Command { @Override public UnitTestResult executeTest(final ITestConfig config, String component) throws Exception { - overrideLoggingConfig(); - logger.info("Spring-Boot test configuration {}", config); Pattern pattern = Pattern.compile(config.getUnitTestInclusionPattern()); @@ -142,28 +135,6 @@ public class UnitTestCommand extends AbstractTestCommand implements Command { return new UnitTestResult(result); } - private void overrideLoggingConfig() { - - URL logbackFile = getClass().getResource("/spring-logback.xml"); - if (logbackFile != null) { - - LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory(); - - try { - JoranConfigurator configurator = new JoranConfigurator(); - configurator.setContext(context); - // Call context.reset() to clear any previous configuration, e.g. default - // configuration. For multi-step configuration, omit calling context.reset(). - context.reset(); - configurator.doConfigure(logbackFile); - } catch (JoranException je) { - // StatusPrinter will handle this - } - StatusPrinter.printInCaseOfErrorsOrWarnings(context); - } - - } - private void disableJmx(Set<String> disabledJmx) throws Exception { logger.info("Disabling JMX names: {}", disabledJmx); for (MBeanServer server : getMBeanServers()) {
