You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ja...@apache.org on 2017/10/28 19:44:42 UTC

lucene-solr:branch_7x: SOLR-11562: Restore Solr ASCII-art in log at startup by removing Default config logging

Repository: lucene-solr
Updated Branches:
  refs/heads/branch_7x cf75e14e4 -> d11913895


SOLR-11562: Restore Solr ASCII-art in log at startup by removing Default config logging

(cherry picked from commit b44497f)


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/d1191389
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/d1191389
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/d1191389

Branch: refs/heads/branch_7x
Commit: d11913895d5e1e68c6e29b9e3fe52df48b712700
Parents: cf75e14
Author: Jan Høydahl <ja...@apache.org>
Authored: Sat Oct 28 21:39:23 2017 +0200
Committer: Jan Høydahl <ja...@apache.org>
Committed: Sat Oct 28 21:42:16 2017 +0200

----------------------------------------------------------------------
 solr/CHANGES.txt                                                   | 2 ++
 solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d1191389/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index bb4b73d..969222e 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -92,6 +92,8 @@ Other Changes
 * SOLR-11165: Ref guide documentation for Autoscaling APIs, triggers, listeners, actions for Solr 7.1
   (ab, Cassandra Targett, Noble Paul, shalin)
 
+* SOLR-11562: Restore Solr logo ASCII-art in startup log by removing unnecessary default confdir logging (janhoy)
+
 ==================  7.1.0 ==================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d1191389/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
index 17c3b56..8f8bda8 100644
--- a/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
+++ b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
@@ -229,7 +229,7 @@ public class SolrDispatchFilter extends BaseSolrFilter {
   private void logWelcomeBanner() {
     log.info(" ___      _       Welcome to Apache Solr™ version {}", solrVersion());
     log.info("/ __| ___| |_ _   Starting in {} mode on port {}", isCloudMode() ? "cloud" : "standalone", getSolrPort());
-    log.info("\\__ \\/ _ \\ | '_|  Install dir: {}, Default config dir: {}", System.getProperty(SOLR_INSTALL_DIR_ATTRIBUTE), System.getProperty(SOLR_DEFAULT_CONFDIR_ATTRIBUTE));
+    log.info("\\__ \\/ _ \\ | '_|  Install dir: {}", System.getProperty(SOLR_INSTALL_DIR_ATTRIBUTE));
     log.info("|___/\\___/_|_|    Start time: {}", Instant.now().toString());
   }