Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-16181 Initialize the LogWatcher earlier in CoreContainer#load() (#543)

Jan Høydahl2cace8011190
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();