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:15 UTC
[1/2] lucene-solr:branch_6x: SOLR-9548: The beginning of solr.log now
starts with a more informative welcome message
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 36cd90929 -> 6e1c82336
SOLR-9548: The beginning of solr.log now starts with a more informative welcome message
(cherry picked from commit 4c7a8c4)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/047b643d
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/047b643d
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/047b643d
Branch: refs/heads/branch_6x
Commit: 047b643d2baeb2e9011d0d1bdf40209c5f1ee2c2
Parents: 36cd909
Author: Jan H�ydahl <ja...@apache.org>
Authored: Mon Sep 26 11:01:24 2016 +0200
Committer: Jan H�ydahl <ja...@apache.org>
Committed: Mon Sep 26 23:23:14 2016 +0200
----------------------------------------------------------------------
solr/CHANGES.txt | 6 ++++--
solr/bin/solr | 1 -
.../apache/solr/servlet/SolrDispatchFilter.java | 21 ++++++++++++++++++++
3 files changed, 25 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/047b643d/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 0f746c5..9029830 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -60,7 +60,7 @@ New Features
* SOLR-9534: You can now set Solr's log level through environment variable SOLR_LOG_LEVEL
Also adds conveience arguments -q (quiet: WARN) and -v (verbose: DEBUG) to bin/solr (janhoy)
-
+
* SOLR-8395: query time {!join} for single value numeric fields. (Cao Manh Dat via mkhl)
* SOLR-9537: Support facet scoring with the scoreNodes expression (Joel Bernstein)
@@ -96,7 +96,7 @@ Bug Fixes
* SOLR-9542: Kerberos delegation tokens requires Jackson library (Ishan Chattopadhyaya via noble)
-* SOLR-9330: Fix AlreadyClosedException on admin/mbeans?stats=true (Mikhail Khludnev)
+* SOLR-9330: Fix AlreadyClosedException on admin/mbeans?stats=true (Mikhail Khludnev)
Optimizations
----------------------
@@ -165,6 +165,8 @@ Other Changes
* SOLR-9500: Add a LogLevel annotation to set log levels on specific tests (Alan
Woodward)
+* SOLR-9548: The beginning of solr.log now starts with a more informative welcome message (janhoy)
+
================== 6.2.1 ==================
Bug Fixes
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/047b643d/solr/bin/solr
----------------------------------------------------------------------
diff --git a/solr/bin/solr b/solr/bin/solr
index bd8118b..2ef480a 100755
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -1562,7 +1562,6 @@ function launch_solr() {
mkdir -p "$SOLR_LOGS_DIR"
if [ "$run_in_foreground" == "true" ]; then
- echo -e "\nStarting Solr$IN_CLOUD_MODE on port $SOLR_PORT from $SOLR_SERVER_DIR\n"
exec "$JAVA" "${SOLR_START_OPTS[@]}" $SOLR_ADDL_ARGS -jar start.jar "${SOLR_JETTY_CONFIG[@]}"
else
# run Solr in the background
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/047b643d/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 e61049b..a48cca1 100644
--- a/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
+++ b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
@@ -35,6 +35,7 @@ import java.io.OutputStream;
import java.lang.invoke.MethodHandles;
import java.nio.file.Path;
import java.nio.file.Paths;
+import java.time.Instant;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Locale;
@@ -48,6 +49,7 @@ import org.apache.commons.io.input.CloseShieldInputStream;
import org.apache.commons.io.output.CloseShieldOutputStream;
import org.apache.commons.lang.StringUtils;
import org.apache.http.client.HttpClient;
+import org.apache.lucene.util.Version;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
import org.apache.solr.common.cloud.SolrZkClient;
@@ -120,6 +122,8 @@ public class SolrDispatchFilter extends BaseSolrFilter {
public void init(FilterConfig config) throws ServletException
{
log.trace("SolrDispatchFilter.init(): {}", this.getClass().getClassLoader());
+
+ logWelcomeBanner();
String muteConsole = System.getProperty(SOLR_LOG_MUTECONSOLE);
if (muteConsole != null && !Arrays.asList("false","0","off","no").contains(muteConsole.toLowerCase(Locale.ROOT))) {
StartupLoggingUtils.muteConsole();
@@ -162,6 +166,23 @@ public class SolrDispatchFilter extends BaseSolrFilter {
log.trace("SolrDispatchFilter.init() done");
}
+ private void logWelcomeBanner() {
+ log.info(" ___ _ Welcome to Apache Solr\u2122 version {}", Version.LATEST);
+ 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 getSolrPort() {
+ return System.getProperty("jetty.port");
+ }
+
+ /* We are in cloud mode if Java option zkRun exists OR zkHost exists and is non-empty */
+ private boolean isCloudMode() {
+ return ((System.getProperty("zkHost") != null && !StringUtils.isEmpty(System.getProperty("zkHost")))
+ || System.getProperty("zkRun") != null);
+ }
+
/**
* Override this to change CoreContainer initialization
* @return a CoreContainer to hold this server's cores
[2/2] lucene-solr:branch_6x: SOLR-9548: Print full solr-impl version
for SNAPSHOT builds
Posted by ja...@apache.org.
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");
}