From f17f260614efa27ed17ae264902d6f68b259853d Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Fri, 24 Jun 2022 10:58:15 -0700 Subject: [PATCH] Initialize ES logging api for tests (#88022) This commit adds initialization of the new ES logging api into ESTestCase, so that tests can begin using the new logging api. --- .../java/org/elasticsearch/common/logging/LogConfigurator.java | 2 +- .../src/main/java/org/elasticsearch/test/ESTestCase.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/server/src/main/java/org/elasticsearch/common/logging/LogConfigurator.java b/server/src/main/java/org/elasticsearch/common/logging/LogConfigurator.java index f9cdd2ec6db21..2147b7a5531b0 100644 --- a/server/src/main/java/org/elasticsearch/common/logging/LogConfigurator.java +++ b/server/src/main/java/org/elasticsearch/common/logging/LogConfigurator.java @@ -124,7 +124,7 @@ public static void configure(final Environment environment, boolean useConsole) configure(environment.settings(), environment.configFile(), environment.logsFile(), useConsole); } - private static void configureESLogging() { + public static void configureESLogging() { LoggerFactory.setInstance(new LoggerFactoryImpl()); } diff --git a/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java index 8526f60e033b3..9ebd1d60a9658 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java @@ -221,7 +221,9 @@ public static void resetPortCounter() { static { TEST_WORKER_VM_ID = System.getProperty(TEST_WORKER_SYS_PROPERTY, DEFAULT_TEST_WORKER_ID); setTestSysProps(); + // TODO: consolidate logging initialization for tests so it all occurs in logconfigurator LogConfigurator.loadLog4jPlugins(); + LogConfigurator.configureESLogging(); for (String leakLoggerName : Arrays.asList("io.netty.util.ResourceLeakDetector", LeakTracker.class.getName())) { Logger leakLogger = LogManager.getLogger(leakLoggerName);