Restore quiet logging on startup
Reinstate initializeWithSensibleDefaults() on AbstractLoggingSystem
beforeInitialize(). This is required to ensure no superfluous logging
output occurs when starting up a spring boot application from the
command line.
It appears that commit e9c649dfb2
modified the logic in an attempt to prevent double initialization.
fixes gh-174
This commit is contained in:
parent
cd1a228210
commit
fa1ff72fb1
|
|
@ -42,6 +42,7 @@ public abstract class AbstractLoggingSystem extends LoggingSystem {
|
|||
|
||||
@Override
|
||||
public void beforeInitialize() {
|
||||
initializeWithSensibleDefaults();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -53,7 +54,6 @@ public abstract class AbstractLoggingSystem extends LoggingSystem {
|
|||
return;
|
||||
}
|
||||
}
|
||||
initializeWithSensibleDefaults();
|
||||
}
|
||||
|
||||
protected void initializeWithSensibleDefaults() {
|
||||
|
|
|
|||
|
|
@ -61,6 +61,7 @@ public class JavaLoggerSystemTests {
|
|||
|
||||
@Test
|
||||
public void testCustomFormatter() throws Exception {
|
||||
this.loggingSystem.beforeInitialize();
|
||||
this.loggingSystem.initialize();
|
||||
this.logger.info("Hello world");
|
||||
String output = this.output.toString().trim();
|
||||
|
|
@ -71,6 +72,7 @@ public class JavaLoggerSystemTests {
|
|||
@Test
|
||||
public void testSystemPropertyInitializesFormat() throws Exception {
|
||||
System.setProperty("PID", "1234");
|
||||
this.loggingSystem.beforeInitialize();
|
||||
this.loggingSystem.initialize("classpath:"
|
||||
+ ClassUtils.addResourcePathToPackagePath(getClass(),
|
||||
"logging.properties"));
|
||||
|
|
@ -83,6 +85,7 @@ public class JavaLoggerSystemTests {
|
|||
|
||||
@Test
|
||||
public void testNonDefaultConfigLocation() throws Exception {
|
||||
this.loggingSystem.beforeInitialize();
|
||||
this.loggingSystem.initialize("classpath:logging-nondefault.properties");
|
||||
this.logger.info("Hello world");
|
||||
String output = this.output.toString().trim();
|
||||
|
|
@ -91,16 +94,19 @@ public class JavaLoggerSystemTests {
|
|||
|
||||
@Test(expected = IllegalStateException.class)
|
||||
public void testNonexistentConfigLocation() throws Exception {
|
||||
this.loggingSystem.beforeInitialize();
|
||||
this.loggingSystem.initialize("classpath:logging-nonexistent.properties");
|
||||
}
|
||||
|
||||
@Test(expected = IllegalArgumentException.class)
|
||||
public void testNullConfigLocation() throws Exception {
|
||||
this.loggingSystem.beforeInitialize();
|
||||
this.loggingSystem.initialize(null);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setLevel() throws Exception {
|
||||
this.loggingSystem.beforeInitialize();
|
||||
this.loggingSystem.initialize();
|
||||
this.logger.debug("Hello");
|
||||
this.loggingSystem.setLogLevel("org.springframework.boot", LogLevel.DEBUG);
|
||||
|
|
|
|||
|
|
@ -58,6 +58,7 @@ public class Log4JLoggingSystemTests {
|
|||
|
||||
@Test
|
||||
public void testNonDefaultConfigLocation() throws Exception {
|
||||
this.loggingSystem.beforeInitialize();
|
||||
this.loggingSystem.initialize("classpath:log4j-nondefault.properties");
|
||||
this.logger.info("Hello world");
|
||||
String output = this.output.toString().trim();
|
||||
|
|
@ -67,16 +68,19 @@ public class Log4JLoggingSystemTests {
|
|||
|
||||
@Test(expected = IllegalStateException.class)
|
||||
public void testNonexistentConfigLocation() throws Exception {
|
||||
this.loggingSystem.beforeInitialize();
|
||||
this.loggingSystem.initialize("classpath:log4j-nonexistent.xml");
|
||||
}
|
||||
|
||||
@Test(expected = IllegalArgumentException.class)
|
||||
public void testNullConfigLocation() throws Exception {
|
||||
this.loggingSystem.beforeInitialize();
|
||||
this.loggingSystem.initialize(null);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setLevel() throws Exception {
|
||||
this.loggingSystem.beforeInitialize();
|
||||
this.loggingSystem.initialize();
|
||||
this.logger.debug("Hello");
|
||||
this.loggingSystem.setLogLevel("org.springframework.boot", LogLevel.DEBUG);
|
||||
|
|
|
|||
|
|
@ -59,6 +59,7 @@ public class LogbackLoggingSystemTests {
|
|||
|
||||
@Test
|
||||
public void testNonDefaultConfigLocation() throws Exception {
|
||||
this.loggingSystem.beforeInitialize();
|
||||
this.loggingSystem.initialize("classpath:logback-nondefault.xml");
|
||||
this.logger.info("Hello world");
|
||||
String output = this.output.toString().trim();
|
||||
|
|
@ -68,16 +69,19 @@ public class LogbackLoggingSystemTests {
|
|||
|
||||
@Test(expected = IllegalStateException.class)
|
||||
public void testNonexistentConfigLocation() throws Exception {
|
||||
this.loggingSystem.beforeInitialize();
|
||||
this.loggingSystem.initialize("classpath:logback-nonexistent.xml");
|
||||
}
|
||||
|
||||
@Test(expected = IllegalArgumentException.class)
|
||||
public void testNullConfigLocation() throws Exception {
|
||||
this.loggingSystem.beforeInitialize();
|
||||
this.loggingSystem.initialize(null);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setLevel() throws Exception {
|
||||
this.loggingSystem.beforeInitialize();
|
||||
this.loggingSystem.initialize();
|
||||
this.logger.debug("Hello");
|
||||
this.loggingSystem.setLogLevel("org.springframework.boot", LogLevel.DEBUG);
|
||||
|
|
|
|||
Loading…
Reference in New Issue