[lucene-solr] branch master updated: Clean up any test failures resulting from defaulting to async logging, reenable shutdown hook

[er...@apache.org]

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

erick pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/master by this push:
     new 5f91670  Clean up any test failures resulting from defaulting to async logging, reenable shutdown hook
5f91670 is described below

commit 5f91670a496275167d7699c24ee7df61d7e2f7e6
Author: erick <er...@gmail.com>
AuthorDate: Tue Mar 5 14:10:36 2019 -0800

    Clean up any test failures resulting from defaulting to async logging, reenable shutdown hook
---
 .../src/java/org/apache/solr/util/StartupLoggingUtils.java    | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/util/StartupLoggingUtils.java b/solr/core/src/java/org/apache/solr/util/StartupLoggingUtils.java
index 67ae692..8181ae5 100644
--- a/solr/core/src/java/org/apache/solr/util/StartupLoggingUtils.java
+++ b/solr/core/src/java/org/apache/solr/util/StartupLoggingUtils.java
@@ -137,12 +137,11 @@ public final class StartupLoggingUtils {
    */
   @SuppressForbidden(reason = "Legitimate log4j2 access")
   public static void shutdown() {
-
-//    if (!isLog4jActive()) {
-//      logNotSupported("Not running log4j2, could not call shutdown for async logging.");
-//      return;
-//    }
-//    LogManager.shutdown(true);
+    if (!isLog4jActive()) {
+      logNotSupported("Not running log4j2, could not call shutdown for async logging.");
+      return;
+    }
+    LogManager.shutdown(true);
   }
   /**
    * Return a string representing the current static ROOT logging level