Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-10488: modernize how infoStream is defined in _default configset (#3909)

Eric Pughca94cf8abad5
diff --git a/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java b/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
index 2842c5acb2e..236c9eb72bf 100644
--- a/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
+++ b/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
@@ -181,13 +181,8 @@ public class SolrIndexConfig implements MapSerializable {
}
if (get("infoStream").boolVal(false)) {
- if (get("infoStream").attr("file") == null) {
- log.info("IndexWriter infoStream solr logging is enabled");
- infoStream = new LoggingInfoStream();
- } else {
- throw new IllegalArgumentException(
- "Remove @file from <infoStream> to output messages to solr's logfile");
- }
+ log.info("IndexWriter infoStream solr logging is enabled");
+ infoStream = new LoggingInfoStream();
}
mergedSegmentWarmerInfo =
getPluginInfo(get("mergedSegmentWarmer"), def.mergedSegmentWarmerInfo);
diff --git a/solr/server/solr/configsets/_default/conf/solrconfig.xml b/solr/server/solr/configsets/_default/conf/solrconfig.xml
index a98ebdc1af0..34fbdbff4a6 100644
--- a/solr/server/solr/configsets/_default/conf/solrconfig.xml
+++ b/solr/server/solr/configsets/_default/conf/solrconfig.xml
@@ -199,7 +199,7 @@
Setting The value to true will instruct the underlying Lucene
IndexWriter to write its debugging info the specified file
-->
- <!-- <infoStream file="INFOSTREAM.txt">false</infoStream> -->
+ <!-- <infoStream>false</infoStream> -->
</indexConfig>
<!-- The default high-performance update handler -->
diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
index 0f73e67ddb9..ebfe158959b 100644
--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
+++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
@@ -201,7 +201,7 @@
IndexWriter to write its info stream to solr's log. By default,
this is enabled here, and controlled through log4j2.xml
-->
- <infoStream>true</infoStream>
+ <!-- <infoStream>false</infoStream> -->
</indexConfig>
<!-- The default high-performance update handler -->