Merge pull request #24359 from gastaldi/log_level

Fix NPE when setting the logger level to null
quarkusio · Mar 17, 2022 · 21e4e25 · 21e4e25
2 parents 9b9623c + e0f42b8
commit 21e4e25
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 23 deletions.
diff --git a/...rtx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/logstream/LogController.java b/...rtx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/logstream/LogController.java
@@ -19,8 +19,8 @@
 import java.util.Enumeration;
 import java.util.List;
 import java.util.TreeMap;
+import java.util.logging.Level;
 
-import org.jboss.logmanager.Level;
 import org.jboss.logmanager.LogContext;
 import org.jboss.logmanager.Logger;
 
@@ -78,11 +78,18 @@ public static Json.JsonObjectBuilder getLogger(String loggerName) {
     public static void updateLogLevel(String loggerName, String levelValue) {
         LogContext logContext = LogContext.getLogContext();
         Logger logger = logContext.getLogger(loggerName);
-        if (logger != null) {
-            java.util.logging.Level level = Level.parse(levelValue);
-            logger.setLevel(level);
-            LOG.info("Log level updated [" + loggerName + "] changed to [" + levelValue + "]");
+        java.util.logging.Level level;
+        if (levelValue == null || levelValue.isBlank()) {
+            if (logger.getParent() != null) {
+                level = logger.getParent().getLevel();
+            } else {
+                throw new IllegalArgumentException("The level of the root logger cannot be set to null");
+            }
+        } else {
+            level = Level.parse(levelValue);
         }
+        logger.setLevel(level);
+        LOG.info("Log level updated [" + loggerName + "] changed to [" + levelValue + "]");
     }
 
     private static String getConfiguredLogLevel(Logger logger) {
@@ -100,22 +107,19 @@ private static String getEffectiveLogLevel(Logger logger) {
         return getEffectiveLogLevel(logger.getParent());
     }
 
-    public static final List<String> LEVELS = new ArrayList<>();
-
-    static {
-        LEVELS.add(OFF.getName());
-        LEVELS.add(SEVERE.getName());
-        LEVELS.add(ERROR.getName());
-        LEVELS.add(FATAL.getName());
-        LEVELS.add(WARNING.getName());
-        LEVELS.add(WARN.getName());
-        LEVELS.add(INFO.getName());
-        LEVELS.add(DEBUG.getName());
-        LEVELS.add(TRACE.getName());
-        LEVELS.add(CONFIG.getName());
-        LEVELS.add(FINE.getName());
-        LEVELS.add(FINER.getName());
-        LEVELS.add(FINEST.getName());
-        LEVELS.add(ALL.getName());
-    }
+    public static final List<String> LEVELS = List.of(
+            OFF.getName(),
+            SEVERE.getName(),
+            ERROR.getName(),
+            FATAL.getName(),
+            WARNING.getName(),
+            WARN.getName(),
+            INFO.getName(),
+            DEBUG.getName(),
+            TRACE.getName(),
+            CONFIG.getName(),
+            FINE.getName(),
+            FINER.getName(),
+            FINEST.getName(),
+            ALL.getName());
 }
diff --git a/...http/runtime/src/test/java/io/quarkus/vertx/http/runtime/logstream/LogControllerTest.java b/...http/runtime/src/test/java/io/quarkus/vertx/http/runtime/logstream/LogControllerTest.java
@@ -0,0 +1,28 @@
+package io.quarkus.vertx.http.runtime.logstream;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.junit.jupiter.api.Test;
+
+class LogControllerTest {
+
+    @Test
+    void updateLogLevelShouldUseParentWhenLevelIsNull() {
+        Logger logger = Logger.getLogger("foo.bar");
+        logger.setLevel(Level.CONFIG);
+        Logger parent = Logger.getLogger("foo");
+        LogController.updateLogLevel("foo.bar", null);
+        assertThat(logger.getLevel()).isEqualTo(parent.getLevel());
+    }
+
+    @Test
+    void updateLogLevelShouldThrowIAEinRootLoggerWhenLevelIsNull() {
+        assertThatIllegalArgumentException().isThrownBy(() -> LogController.updateLogLevel("", null))
+                .withMessage("The level of the root logger cannot be set to null");
+    }
+
+}