X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/b55d75ef992b8a58a1b87e2880dd0cf3451e1aaa..00e71ed0fc63959063e79b06bb31da6aa3e71e00:/src/main/java/org/asamk/signal/logging/LogConfigurator.java diff --git a/src/main/java/org/asamk/signal/logging/LogConfigurator.java b/src/main/java/org/asamk/signal/logging/LogConfigurator.java index 8571aff9..65e8c4f5 100644 --- a/src/main/java/org/asamk/signal/logging/LogConfigurator.java +++ b/src/main/java/org/asamk/signal/logging/LogConfigurator.java @@ -6,10 +6,10 @@ import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.PatternLayout; +import ch.qos.logback.classic.jul.LevelChangePropagator; import ch.qos.logback.classic.spi.Configurator; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.ConsoleAppender; -import ch.qos.logback.core.Context; import ch.qos.logback.core.FileAppender; import ch.qos.logback.core.Layout; import ch.qos.logback.core.encoder.LayoutWrappingEncoder; @@ -36,11 +36,13 @@ public class LogConfigurator extends ContextAwareBase implements Configurator { } @Override - public ExecutionStatus configure(final Context context) { - LoggerContext lc = (LoggerContext) context; + public ExecutionStatus configure(LoggerContext lc) { + lc.addListener(new LevelChangePropagator() {{ + setContext(lc); + }}); final var rootLogger = lc.getLogger(Logger.ROOT_LOGGER_NAME); - final var defaultLevel = verboseLevel > 1 ? Level.ALL : verboseLevel > 0 ? Level.INFO : Level.WARN; + final var defaultLevel = verboseLevel > 2 ? Level.ALL : verboseLevel > 0 ? Level.INFO : Level.WARN; rootLogger.setLevel(defaultLevel); final var consoleLayout = verboseLevel == 0 || logFile != null @@ -50,6 +52,12 @@ public class LogConfigurator extends ContextAwareBase implements Configurator { rootLogger.addAppender(consoleAppender); lc.getLogger("org.asamk").setLevel(verboseLevel > 1 ? Level.ALL : verboseLevel > 0 ? Level.DEBUG : Level.INFO); + lc.getLogger("org.asamk.Signal") + .setLevel(verboseLevel > 2 ? Level.ALL : verboseLevel > 1 ? Level.INFO : Level.WARN); + lc.getLogger("com.zaxxer.hikari.pool.PoolBase") + .setLevel(verboseLevel > 2 ? Level.ALL : verboseLevel > 1 ? Level.INFO : Level.WARN); + lc.getLogger("org.sqlite.core.NativeDB") + .setLevel(verboseLevel > 3 ? Level.ALL : verboseLevel > 1 ? Level.INFO : Level.WARN); if (logFile != null) { consoleAppender.addFilter(new Filter<>() {