Apply PR Comments

micronaut-projects · Nov 15, 2022 · 65e0386 · 65e0386
1 parent e832c27
commit 65e0386
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 7 deletions.
diff --git a/...ent/src/main/java/io/micronaut/management/endpoint/loggers/impl/LogbackLoggingSystem.java b/...ent/src/main/java/io/micronaut/management/endpoint/loggers/impl/LogbackLoggingSystem.java
@@ -18,10 +18,13 @@
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.Logger;
 import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.util.ContextInitializer;
+import ch.qos.logback.core.joran.spi.JoranException;
 import io.micronaut.context.annotation.Replaces;
 import io.micronaut.context.annotation.Requires;
 import io.micronaut.core.annotation.NonNull;
 import io.micronaut.logging.LogLevel;
+import io.micronaut.logging.LoggingSystemException;
 import io.micronaut.management.endpoint.loggers.LoggerConfiguration;
 import io.micronaut.management.endpoint.loggers.LoggersEndpoint;
 import io.micronaut.management.endpoint.loggers.ManagedLoggingSystem;
@@ -42,6 +45,10 @@
 @Requires(classes = ch.qos.logback.classic.LoggerContext.class)
 @Replaces(io.micronaut.logging.impl.LogbackLoggingSystem.class)
 public class LogbackLoggingSystem implements ManagedLoggingSystem, io.micronaut.logging.LoggingSystem {
+    private static final String DEFAULT_LOGBACK_LOCATION = "logback.xml";
+
+    @Property(name = "logger.config")
+    private Optional<String> logbackXmlLocation;
 
     @Override
     @NonNull
@@ -106,4 +113,21 @@ private static Level toLevel(LogLevel logLevel) {
             return Level.valueOf(logLevel.name());
         }
     }
+
+    @Override
+    public void refresh() {
+        LoggerContext context = getLoggerContext();
+        context.reset();
+        String logbackXml = logbackXmlLocation.orElse(DEFAULT_LOGBACK_LOCATION);
+        URL resource = getClass().getClassLoader().getResource(logbackXml);
+        if (Objects.isNull(resource)) {
+            throw new LoggingSystemException("Resource " + logbackXml + " not found");
+        }
+
+        try {            
+            new ContextInitializer(context).configureByResource(resource);
+        } catch (JoranException e) {
+            throw new LoggingSystemException("Error while refreshing Logback", e);
+        }
+    }
 }
diff --git a/runtime/src/main/java/io/micronaut/logging/impl/LogbackLoggingSystem.java b/runtime/src/main/java/io/micronaut/logging/impl/LogbackLoggingSystem.java
@@ -20,7 +20,7 @@
 
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.LoggerContext;
-import ch.qos.logback.classic.joran.JoranConfigurator;
+import ch.qos.logback.classic.util.ContextInitializer;
 import ch.qos.logback.core.joran.spi.JoranException;
 import io.micronaut.context.annotation.Property;
 import io.micronaut.context.annotation.Requires;
@@ -54,14 +54,16 @@ public void setLogLevel(String name, LogLevel level) {
 
     @Override
     public void refresh() {
-        getLoggerContext().reset();
-        JoranConfigurator joranConfigurator = new JoranConfigurator();
-        joranConfigurator.setContext(getLoggerContext());
+        LoggerContext context = getLoggerContext();
+        context.reset();
         String logbackXml = logbackXmlLocation.orElse(DEFAULT_LOGBACK_LOCATION);
+        URL resource = getClass().getClassLoader().getResource(logbackXml);
+        if (Objects.isNull(resource)) {
+            throw new LoggingSystemException("Resource " + logbackXml + " not found");
+        }
 
-        try {
-            URL resource = getClass().getClassLoader().getResource(logbackXml);
-            joranConfigurator.doConfigure(resource);
+        try {            
+            new ContextInitializer(context).configureByResource(resource);
         } catch (JoranException e) {
             throw new LoggingSystemException("Error while refreshing Logback", e);
         }