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 2016/09/26 21:24:16 UTC
[2/2] lucene-solr:branch_6x: SOLR-9548: Print full solr-impl version
for SNAPSHOT builds
SOLR-9548: Print full solr-impl version for SNAPSHOT builds
(cherry picked from commit c1553c2)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/6e1c8233
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/6e1c8233
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/6e1c8233
Branch: refs/heads/branch_6x
Commit: 6e1c82336f2fba7ea15ec37037a1515f6ef4ecb5
Parents: 047b643
Author: Jan H�ydahl <ja...@apache.org>
Authored: Mon Sep 26 23:22:49 2016 +0200
Committer: Jan H�ydahl <ja...@apache.org>
Committed: Mon Sep 26 23:24:01 2016 +0200
----------------------------------------------------------------------
.../org/apache/solr/servlet/SolrDispatchFilter.java | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6e1c8233/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 a48cca1..fffee88 100644
--- a/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
+++ b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
@@ -167,12 +167,22 @@ public class SolrDispatchFilter extends BaseSolrFilter {
}
private void logWelcomeBanner() {
- log.info(" ___ _ Welcome to Apache Solr\u2122 version {}", Version.LATEST);
+ log.info(" ___ _ Welcome to Apache Solr\u2122 version {}", solrVersion());
log.info("/ __| ___| |_ _ Starting in {} mode on port {}", isCloudMode() ? "cloud" : "standalone", getSolrPort());
log.info("\\__ \\/ _ \\ | '_| Install dir: {}", System.getProperty("solr.install.dir"));
log.info("|___/\\___/_|_| Start time: {}", Instant.now().toString());
}
+ private String solrVersion() {
+ String specVer = Version.LATEST.toString();
+ try {
+ String implVer = SolrCore.class.getPackage().getImplementationVersion();
+ return (specVer.equals(implVer.split(" ")[0])) ? specVer : implVer;
+ } catch (Exception e) {
+ return specVer;
+ }
+ }
+
private String getSolrPort() {
return System.getProperty("jetty.port");
}