iter

Author: rjernst

libs/logging/src/main/java/org/elasticsearch/logging/internal/spi/LoggerFactory.java

@@ -29,6 +29,8 @@ public static LoggerFactory provider() {
 
     public abstract void setRootLevel(Level level);
 
+    public abstract Level getRootLevel();
+
     public static void setInstance(LoggerFactory INSTANCE) {
         LoggerFactory.INSTANCE = INSTANCE;
     }

server/src/main/java/org/elasticsearch/common/logging/internal/LevelUtil.java

@@ -9,20 +9,51 @@
 
 package org.elasticsearch.common.logging.internal;
 
+import static org.apache.logging.log4j.Level.ALL;
+import static org.apache.logging.log4j.Level.DEBUG;
+import static org.apache.logging.log4j.Level.ERROR;
+import static org.apache.logging.log4j.Level.FATAL;
+import static org.apache.logging.log4j.Level.INFO;
+import static org.apache.logging.log4j.Level.OFF;
+import static org.apache.logging.log4j.Level.TRACE;
+import static org.apache.logging.log4j.Level.WARN;
+
 public final class LevelUtil {
 
     private LevelUtil() {}
 
     public static org.apache.logging.log4j.Level log4jLevel(final org.elasticsearch.logging.Level level) {
         return switch (level) {
-            case OFF -> org.apache.logging.log4j.Level.OFF;
-            case FATAL -> org.apache.logging.log4j.Level.FATAL;
+            case OFF -> OFF;
+            case FATAL -> FATAL;
             case ERROR -> org.apache.logging.log4j.Level.ERROR;
-            case WARN -> org.apache.logging.log4j.Level.WARN;
+            case WARN -> WARN;
             case INFO -> org.apache.logging.log4j.Level.INFO;
             case DEBUG -> org.apache.logging.log4j.Level.DEBUG;
-            case TRACE -> org.apache.logging.log4j.Level.TRACE;
+            case TRACE -> TRACE;
             case ALL -> org.apache.logging.log4j.Level.ALL;
         };
     }
+
+    public static org.elasticsearch.logging.Level elasticsearchLevel(final org.apache.logging.log4j.Level log4jLevel) {
+        // we can't use a switch because log4j levels are not an enum
+        if (log4jLevel == OFF) {
+            return org.elasticsearch.logging.Level.OFF;
+        } else if (log4jLevel == FATAL) {
+            return org.elasticsearch.logging.Level.FATAL;
+        } else if (log4jLevel == ERROR) {
+            return org.elasticsearch.logging.Level.ERROR;
+        } else if (log4jLevel == WARN) {
+            return org.elasticsearch.logging.Level.WARN;
+        } else if (log4jLevel == INFO) {
+            return org.elasticsearch.logging.Level.INFO;
+        } else if (log4jLevel == DEBUG) {
+            return org.elasticsearch.logging.Level.DEBUG;
+        } else if (log4jLevel == TRACE) {
+            return org.elasticsearch.logging.Level.TRACE;
+        } else if (log4jLevel == ALL) {
+            return org.elasticsearch.logging.Level.ALL;
+        }
+        throw new AssertionError("unknown log4j level [" + log4jLevel + "]");
+    }
 }

server/src/main/java/org/elasticsearch/common/logging/internal/LoggerFactoryImpl.java

@@ -38,4 +38,9 @@ public void setRootLevel(Level level) {
         var log4jLevel = LevelUtil.log4jLevel(level);
         Loggers.setLevel(LogManager.getRootLogger(), log4jLevel);
     }
+
+    @Override
+    public Level getRootLevel() {
+        return LevelUtil.elasticsearchLevel(LogManager.getRootLogger().getLevel());
+    }
 }

test/framework/src/main/java/org/elasticsearch/cli/CommandTestCase.java

@@ -9,8 +9,13 @@
 
 package org.elasticsearch.cli;
 
+import org.elasticsearch.common.logging.internal.LevelUtil;
+import org.elasticsearch.logging.Level;
+import org.elasticsearch.logging.LogManager;
+import org.elasticsearch.logging.internal.spi.LoggerFactory;
 import org.elasticsearch.test.ESTestCase;
 import org.hamcrest.Matcher;
+import org.junit.After;
 import org.junit.Before;
 
 import java.io.IOException;
@@ -43,6 +48,8 @@ public abstract class CommandTestCase extends ESTestCase {
     /** The ES config dir */
     protected Path configDir;
 
+    private Level capturedLogLevel;
+
     /** Whether to include a whitespace in the file-system path. */
     private final boolean spaceInPath;
 
@@ -56,6 +63,7 @@ protected CommandTestCase(boolean spaceInPath) {
 
     @Before
     public void resetTerminal() throws IOException {
+        capturedLogLevel = LoggerFactory.provider().getRootLevel();
         terminal.reset();
         terminal.setSupportsBinary(false);
         terminal.setVerbosity(Terminal.Verbosity.NORMAL);
@@ -73,6 +81,11 @@ public void resetTerminal() throws IOException {
         envVars.clear();
     }
 
+    @After
+    public void restoreRootLogLevel() {
+        LoggerFactory.provider().setRootLevel(capturedLogLevel);
+    }
+
     /** Creates a Command to test execution. */
     protected abstract Command newCommand();