Skip to content

Commit 9d17317

Browse files
authored
Merge pull request #124 from avaje/fix/dynamic-config
Fix for avaje-dynamic-config initial keys
2 parents e413ed1 + 3d063f7 commit 9d17317

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

avaje-dynamic-logback/src/main/java/io/avaje/config/dynamiclogback/LogbackPlugin.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,17 @@ public void apply(Configuration configuration) {
2323
final var loggerContext = loggerContext();
2424
final var config = configuration.forPath("log.level");
2525
for (String key : config.keys()) {
26-
String rawLevel = configuration.get(key);
26+
String rawLevel = config.getNullable(key);
2727
setLogLevel(key, loggerContext, rawLevel);
2828
}
2929
configuration.onChange(this::onChangeAny);
3030
}
3131

32-
private static void setLogLevel(String key, LoggerContext loggerContext, String rawLevel) {
33-
String logKey = key.substring(10);
34-
Logger logger = loggerContext.getLogger(logKey);
35-
if (logger != null) {
36-
log.log(DEBUG, "logger change for {0} to {1}", logKey, rawLevel);
37-
logger.setLevel(Level.toLevel(rawLevel));
32+
private static void setLogLevel(String key, LoggerContext loggerContext, String level) {
33+
Logger logger = loggerContext.getLogger(key);
34+
if (logger != null && level != null) {
35+
log.log(DEBUG, "logger change for {0} to {1}", key, level);
36+
logger.setLevel(Level.toLevel(level));
3837
}
3938
}
4039

@@ -44,7 +43,7 @@ private void onChangeAny(ModificationEvent modificationEvent) {
4443
modificationEvent.modifiedKeys().stream()
4544
.filter(key -> key.startsWith("log.level."))
4645
.forEach(key -> {
47-
String rawLevel = config.get(key);
46+
String rawLevel = config.getNullable(key.substring(10));
4847
setLogLevel(key, loggerContext, rawLevel);
4948
});
5049
}

0 commit comments

Comments
 (0)