You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2021/03/02 04:52:06 UTC

[logging-log4j2] branch release-2.x updated: Shutdown log4j before deleting files

This is an automated email from the ASF dual-hosted git repository.

rgoers pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


The following commit(s) were added to refs/heads/release-2.x by this push:
     new 6602465  Shutdown log4j before deleting files
6602465 is described below

commit 660246546d7feeb95c86e365a94e6e4b07bec39c
Author: Ralph Goers <rg...@apache.org>
AuthorDate: Mon Mar 1 21:51:43 2021 -0700

    Shutdown log4j before deleting files
---
 .../log4j/core/appender/rolling/RollingAppenderOnStartupDirectTest.java | 2 +-
 .../log4j/core/appender/rolling/RollingAppenderOnStartupTest.java       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderOnStartupDirectTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderOnStartupDirectTest.java
index 4de059b..1cb9efd 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderOnStartupDirectTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderOnStartupDirectTest.java
@@ -97,13 +97,13 @@ public class RollingAppenderOnStartupDirectTest {
 
     @AfterClass
     public static void afterClass() throws Exception {
+        Configurator.shutdown(loggerContext);
         try (DirectoryStream<Path> directoryStream = Files.newDirectoryStream(Paths.get(DIR))) {
             for (final Path path : directoryStream) {
                 Files.delete(path);
             }
         }
         Files.delete(Paths.get(DIR));
-        Configurator.shutdown(loggerContext);
     }
 
 }
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderOnStartupTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderOnStartupTest.java
index 2d739d7..748d585 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderOnStartupTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderOnStartupTest.java
@@ -98,13 +98,13 @@ public class RollingAppenderOnStartupTest {
 
     @AfterClass
     public static void afterClass() throws Exception {
+        Configurator.shutdown(loggerContext);
         try (DirectoryStream<Path> directoryStream = Files.newDirectoryStream(Paths.get(DIR))) {
             for (final Path path : directoryStream) {
                 Files.delete(path);
             }
         }
         Files.delete(Paths.get(DIR));
-        Configurator.shutdown(loggerContext);
     }
 
 }