[solr] branch main updated: SOLR-16181 Initialize the LogWatcher earlier in CoreContainer#load() (#543)

[ja...@apache.org]

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

janhoy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/main by this push:
     new 2cace801119 SOLR-16181 Initialize the LogWatcher earlier in CoreContainer#load() (#543)
2cace801119 is described below

commit 2cace80111908a33bfaed7a1fd57530ab2017e9b
Author: Jan Høydahl <ja...@users.noreply.github.com>
AuthorDate: Thu May 5 12:46:59 2022 +0200

    SOLR-16181 Initialize the LogWatcher earlier in CoreContainer#load() (#543)
---
 solr/CHANGES.txt                                           | 2 ++
 solr/core/src/java/org/apache/solr/core/CoreContainer.java | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index f6c30761c99..ee411d6f069 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -44,6 +44,8 @@ Improvements
 * SOLR-15045: `DistributedZkUpdateProcessor` now issues commits to local shards and remote shards in parallel,
   halving the latency of synchronous commits (Michael Gibney)
 
+* SOLR-16181: Initialize the LogWatcher earlier in CoreContainer#load() (janhoy)
+
 Optimizations
 ---------------------
 * SOLR-16120: Optimise hl.fl expansion. (Christine Poerschke, David Smiley, Mike Drob)
diff --git a/solr/core/src/java/org/apache/solr/core/CoreContainer.java b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
index e30ca217bbf..b04f824597d 100644
--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@ -696,6 +696,8 @@ public class CoreContainer {
       log.debug("Loading cores into CoreContainer [instanceDir={}]", getSolrHome());
     }
 
+    logging = LogWatcher.newRegisteredLogWatcher(cfg.getLogWatcherConfig(), loader);
+
     ClusterEventProducerFactory clusterEventProducerFactory = new ClusterEventProducerFactory(this);
     clusterEventProducer = clusterEventProducerFactory;
 
@@ -733,8 +735,6 @@ public class CoreContainer {
 
     solrCores.load(loader);
 
-    logging = LogWatcher.newRegisteredLogWatcher(cfg.getLogWatcherConfig(), loader);
-
     StartupLoggingUtils.checkRequestLogging();
 
     hostName = cfg.getNodeName();