Evaluate StatusLogger.getLogger lazily

neighbourhoodie · Mar 25, 2024 · 21b283f · 21b283f
1 parent 0396436
commit 21b283f
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/TempLoggingDirectory.java b/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/TempLoggingDirectory.java
@@ -28,7 +28,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.status.StatusLogger;
 import org.apache.logging.log4j.test.TestProperties;
 import org.junit.jupiter.api.extension.BeforeAllCallback;
@@ -45,16 +44,14 @@
 
 public class TempLoggingDirectory implements BeforeAllCallback, BeforeEachCallback, ParameterResolver {
 
-    private static final Logger LOGGER = StatusLogger.getLogger();
-
     @Override
     public void beforeAll(ExtensionContext context) throws Exception {
         final List<Field> fields = AnnotationSupport.findAnnotatedFields(
                 context.getRequiredTestClass(), TempLoggingDir.class, ModifierSupport::isStatic);
         Path loggingPath = null;
         for (final Field field : fields) {
             if (loggingPath != null) {
-                LOGGER.warn("Multiple fields with @TempLoggingDir annotation are not supported.");
+                StatusLogger.getLogger().warn("Multiple fields with @TempLoggingDir annotation are not supported.");
             } else {
                 final CleanupMode cleanup = determineCleanupMode(field);
                 loggingPath = createLoggingPath(context, cleanup).getPath();
@@ -81,7 +78,7 @@ public void beforeEach(ExtensionContext context) throws Exception {
         final Object instance = context.getRequiredTestInstance();
         for (final Field field : fields) {
             if (loggingPath != null) {
-                LOGGER.warn("Multiple fields with @TempLoggingDir annotation are not supported.");
+                StatusLogger.getLogger().warn("Multiple fields with @TempLoggingDir annotation are not supported.");
             } else {
                 final CleanupMode cleanup = determineCleanupMode(field);
                 loggingPath = createLoggingPath(context, cleanup).getPath();
@@ -180,7 +177,7 @@ public void close() throws IOException {
                     || (cleanupMode == ON_SUCCESS
                             && contexts.keySet().stream().anyMatch(context -> context.getExecutionException()
                                     .isPresent()))) {
-                LOGGER.debug("Skipping cleanup of directory {}.", path);
+                StatusLogger.getLogger().debug("Skipping cleanup of directory {}.", path);
                 return;
             }
             DirectoryCleaner.deleteDirectory(path);