Skip to content

Commit fa3de69

Browse files
committed
fix LOGBACK-1655
Signed-off-by: Ceki Gulcu <ceki@qos.ch>
1 parent 8de4c2d commit fa3de69

17 files changed

+225
-809
lines changed

logback-classic/src/main/java/ch/qos/logback/classic/BasicConfigurator.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class BasicConfigurator extends ContextAwareBase implements Configurator
3232
public BasicConfigurator() {
3333
}
3434

35-
public void configure(LoggerContext lc) {
35+
public ExecutionStatus configure(LoggerContext lc) {
3636
addInfo("Setting up default configuration.");
3737

3838
ConsoleAppender<ILoggingEvent> ca = new ConsoleAppender<ILoggingEvent>();
@@ -56,5 +56,8 @@ public void configure(LoggerContext lc) {
5656

5757
Logger rootLogger = lc.getLogger(Logger.ROOT_LOGGER_NAME);
5858
rootLogger.addAppender(ca);
59+
60+
// let the caller decide
61+
return ExecutionStatus.NEUTRAL;
5962
}
6063
}

logback-classic/src/main/java/ch/qos/logback/classic/jmx/JMXConfigurator.java

Lines changed: 0 additions & 296 deletions
This file was deleted.

logback-classic/src/main/java/ch/qos/logback/classic/jmx/JMXConfiguratorMBean.java

Lines changed: 0 additions & 39 deletions
This file was deleted.

0 commit comments

Comments
 (0)