lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gcha...@apache.org
Subject lucene-solr:master: SOLR-9047: zkcli should allow alternative locations for log4j configuration
Date Fri, 29 Apr 2016 18:30:52 GMT
Repository: lucene-solr
Updated Branches:
  refs/heads/master 7ed472fb5 -> 0dec8f941


SOLR-9047: zkcli should allow alternative locations for log4j configuration


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

Branch: refs/heads/master
Commit: 0dec8f9415a9d97a93870a416e96366db60a72fa
Parents: 7ed472f
Author: Gregory Chanan <gchanan@cloudera.com>
Authored: Fri Apr 29 11:29:24 2016 -0700
Committer: Gregory Chanan <gchanan@cloudera.com>
Committed: Fri Apr 29 11:29:24 2016 -0700

----------------------------------------------------------------------
 solr/CHANGES.txt                            | 2 ++
 solr/server/scripts/cloud-scripts/zkcli.bat | 8 +++++++-
 solr/server/scripts/cloud-scripts/zkcli.sh  | 8 +++++++-
 3 files changed, 16 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0dec8f94/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 0f88428..b0716bf 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -224,6 +224,8 @@ Other Changes
 
 * SOLR-9037: Replace multiple "/replication" strings with one static constant. (Christine
Poerschke)
 
+* SOLR-9047: zkcli should allow alternative locations for log4j configuration (Gregory Chanan)
+
 ==================  6.0.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/0dec8f94/solr/server/scripts/cloud-scripts/zkcli.bat
----------------------------------------------------------------------
diff --git a/solr/server/scripts/cloud-scripts/zkcli.bat b/solr/server/scripts/cloud-scripts/zkcli.bat
index 933e8a3..b4b9693 100644
--- a/solr/server/scripts/cloud-scripts/zkcli.bat
+++ b/solr/server/scripts/cloud-scripts/zkcli.bat
@@ -9,4 +9,10 @@ REM  Find location of this script
 set SDIR=%~dp0
 if "%SDIR:~-1%"=="\" set SDIR=%SDIR:~0,-1%
 
-"%JVM%" -Dlog4j.configuration="file:%SDIR%\log4j.properties" -classpath "%SDIR%\..\..\solr-webapp\webapp\WEB-INF\lib\*;%SDIR%\..\..\lib\ext\*"
org.apache.solr.cloud.ZkCLI %*
+if defined LOG4J_PROPS (
+  set "LOG4J_CONFIG=file:%LOG4J_PROPS%"
+) else (
+  set "LOG4J_CONFIG=file:%SDIR%\log4j.properties"
+)
+
+"%JVM%" -Dlog4j.configuration="%LOG4J_PROPS%" -classpath "%SDIR%\..\..\solr-webapp\webapp\WEB-INF\lib\*;%SDIR%\..\..\lib\ext\*"
org.apache.solr.cloud.ZkCLI %*

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0dec8f94/solr/server/scripts/cloud-scripts/zkcli.sh
----------------------------------------------------------------------
diff --git a/solr/server/scripts/cloud-scripts/zkcli.sh b/solr/server/scripts/cloud-scripts/zkcli.sh
index 15b5392..d049be0 100755
--- a/solr/server/scripts/cloud-scripts/zkcli.sh
+++ b/solr/server/scripts/cloud-scripts/zkcli.sh
@@ -9,5 +9,11 @@ JVM="java"
 
 sdir="`dirname \"$0\"`"
 
-PATH=$JAVA_HOME/bin:$PATH $JVM -Dlog4j.configuration=file:$sdir/log4j.properties -classpath
"$sdir/../../solr-webapp/webapp/WEB-INF/lib/*:$sdir/../../lib/ext/*" org.apache.solr.cloud.ZkCLI
${1+"$@"}
+if [ -n "$LOG4J_PROPS" ]; then
+  log4j_config="file:$LOG4J_PROPS"
+else
+  log4j_config="file:$sdir/log4j.properties"
+fi
+
+PATH=$JAVA_HOME/bin:$PATH $JVM -Dlog4j.configuration=$log4j_config -classpath "$sdir/../../solr-webapp/webapp/WEB-INF/lib/*:$sdir/../../lib/ext/*"
org.apache.solr.cloud.ZkCLI ${1+"$@"}
 


Mime
View raw message