Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-14109: Always log to stdout from server/scripts/cloud-scripts/zkcli.{bat|sh} (#1130)

This commit is contained in:
Jan Høydahl 2019-12-30 16:28:24 +01:00 committed by GitHub
parent 5a50eaa2c6
commit 33bd811fb8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/CHANGES.txt
View File

@ -195,6 +195,8 @@ Bug Fixes
* SOLR-14106: Cleanup Jetty SslContextFactory usage (Ryan Rockenbaugh, Jan Hoydahl, Kevin Risden) * SOLR-14106: Cleanup Jetty SslContextFactory usage (Ryan Rockenbaugh, Jan Hoydahl, Kevin Risden)
* SOLR-14109: Always log to stdout from server/scripts/cloud-scripts/zkcli.{bat|sh} (janhoy)
Other Changes Other Changes
--------------------- ---------------------

6
solr/server/scripts/cloud-scripts/zkcli.bat
View File

@ -9,11 +9,7 @@ REM Find location of this script
set SDIR=%~dp0 set SDIR=%~dp0
if "%SDIR:~-1%"=="\" set SDIR=%SDIR:~0,-1% if "%SDIR:~-1%"=="\" set SDIR=%SDIR:~0,-1%
if defined LOG4J_PROPS ( set "LOG4J_CONFIG=file:///%SDIR%\..\..\resources\log4j2-console.xml"
set "LOG4J_CONFIG=file:///%LOG4J_PROPS%"
) else (
set "LOG4J_CONFIG=file:///%SDIR%\..\..\resources\log4j2-console.xml"
)
REM Settings for ZK ACL REM Settings for ZK ACL
REM set SOLR_ZK_CREDS_AND_ACLS=-DzkACLProvider=org.apache.solr.common.cloud.VMParamsAllAndReadonlyDigestZkACLProvider ^ REM set SOLR_ZK_CREDS_AND_ACLS=-DzkACLProvider=org.apache.solr.common.cloud.VMParamsAllAndReadonlyDigestZkACLProvider ^

6
solr/server/scripts/cloud-scripts/zkcli.sh
View File

@ -9,11 +9,7 @@ JVM="java"
sdir="`dirname \"$0\"`" sdir="`dirname \"$0\"`"
if [ -n "$LOG4J_PROPS" ]; then log4j_config="file:$sdir/../../resources/log4j2-console.xml"
log4j_config="file:$LOG4J_PROPS"
else
log4j_config="file:$sdir/../../resources/log4j2-console.xml"
fi
# Settings for ZK ACL # Settings for ZK ACL
#SOLR_ZK_CREDS_AND_ACLS="-DzkACLProvider=org.apache.solr.common.cloud.VMParamsAllAndReadonlyDigestZkACLProvider \ #SOLR_ZK_CREDS_AND_ACLS="-DzkACLProvider=org.apache.solr.common.cloud.VMParamsAllAndReadonlyDigestZkACLProvider \