You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by el...@apache.org on 2013/05/11 00:29:31 UTC

svn commit: r1481220 - in /lucene/dev/trunk/solr: CHANGES.txt example/cloud-scripts/log4j.properties example/cloud-scripts/zkcli.bat example/cloud-scripts/zkcli.sh

Author: elyograg
Date: Fri May 10 22:29:30 2013
New Revision: 1481220

URL: http://svn.apache.org/r1481220
Log:
SOLR-4807: zkcli fix for log4j and Windows

Added:
    lucene/dev/trunk/solr/example/cloud-scripts/log4j.properties   (with props)
Modified:
    lucene/dev/trunk/solr/CHANGES.txt
    lucene/dev/trunk/solr/example/cloud-scripts/zkcli.bat
    lucene/dev/trunk/solr/example/cloud-scripts/zkcli.sh

Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1481220&r1=1481219&r2=1481220&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Fri May 10 22:29:30 2013
@@ -164,6 +164,9 @@ Bug Fixes
 
 * SOLR-4806: Shard splitting does not abort if WaitForState times out (shalin)
 
+* SOLR-4807: The zkcli script now works with log4j. The zkcli.bat script
+  was broken on Windows in 4.3.0, now it works. (Shawn Heisey)
+
 Other Changes
 ----------------------
 

Added: lucene/dev/trunk/solr/example/cloud-scripts/log4j.properties
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/cloud-scripts/log4j.properties?rev=1481220&view=auto
==============================================================================
--- lucene/dev/trunk/solr/example/cloud-scripts/log4j.properties (added)
+++ lucene/dev/trunk/solr/example/cloud-scripts/log4j.properties Fri May 10 22:29:30 2013
@@ -0,0 +1,8 @@
+#  Logging level
+log4j.rootLogger=INFO, stderr
+
+# log to stderr
+log4j.appender.stderr = org.apache.log4j.ConsoleAppender
+log4j.appender.stderr.Target = System.err
+log4j.appender.stderr.layout = org.apache.log4j.PatternLayout
+log4j.appender.stderr.layout.ConversionPattern=%-5p - %d{yyyy-MM-dd HH:mm:ss.SSS}; %C; %m\n

Modified: lucene/dev/trunk/solr/example/cloud-scripts/zkcli.bat
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/cloud-scripts/zkcli.bat?rev=1481220&r1=1481219&r2=1481220&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/cloud-scripts/zkcli.bat (original)
+++ lucene/dev/trunk/solr/example/cloud-scripts/zkcli.bat Fri May 10 22:29:30 2013
@@ -8,5 +8,4 @@ REM  Find location of this script
 set SDIR=%~dp0
 if "%SDIR:~-1%"=="\" set SDIR=%SDIR:~0,-1%
 
-     
-"%JVM%" -classpath "%SDIR%\..\solr-webapp\webapp\WEB-INF\lib\*;%SDIR%\..\lib\ext" org.apache.solr.cloud.ZkCLI %*
+"%JVM%" -Dlog4j.configuration=file:%SDIR%\log4j.properties -classpath "%SDIR%\..\solr-webapp\webapp\WEB-INF\lib\*;%SDIR%\..\lib\ext\*" org.apache.solr.cloud.ZkCLI %*

Modified: lucene/dev/trunk/solr/example/cloud-scripts/zkcli.sh
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/cloud-scripts/zkcli.sh?rev=1481220&r1=1481219&r2=1481220&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/cloud-scripts/zkcli.sh (original)
+++ lucene/dev/trunk/solr/example/cloud-scripts/zkcli.sh Fri May 10 22:29:30 2013
@@ -9,6 +9,5 @@ JVM="java"
 
 sdir="`dirname \"$0\"`"
 
-
-$JVM  -classpath "$sdir/../solr-webapp/webapp/WEB-INF/lib/*:$sdir/../lib/ext/*" org.apache.solr.cloud.ZkCLI ${1+"$@"}
+$JVM -Dlog4j.configuration=file:$sdir/log4j.properties -classpath "$sdir/../solr-webapp/webapp/WEB-INF/lib/*:$sdir/../lib/ext/*" org.apache.solr.cloud.ZkCLI ${1+"$@"}