[lucene-solr] branch branch_8_4 updated: SOLR-14109: Always log to stdout from server/scripts/cloud-scripts/zkcli.{bat|sh} (#1130)

[ja...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

janhoy pushed a commit to branch branch_8_4
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/branch_8_4 by this push:
     new 2df5274  SOLR-14109: Always log to stdout from server/scripts/cloud-scripts/zkcli.{bat|sh} (#1130)
2df5274 is described below

commit 2df5274617205a1b61bbb42cecb305eb39fb7a54
Author: Jan Høydahl <ja...@apache.org>
AuthorDate: Mon Dec 30 16:28:24 2019 +0100

    SOLR-14109: Always log to stdout from server/scripts/cloud-scripts/zkcli.{bat|sh} (#1130)
    
    (cherry picked from commit 33bd811fb8b2a9bee595548e96c2a74721aa11b3)
---
 solr/CHANGES.txt                            | 6 ++++--
 solr/server/scripts/cloud-scripts/zkcli.bat | 6 +-----
 solr/server/scripts/cloud-scripts/zkcli.sh  | 6 +-----
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 11641ab..4b66e8d 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -33,6 +33,8 @@ Bug Fixes
 
 * 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)
+
 ==================  8.4.0 ==================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
@@ -111,7 +113,7 @@ New Features
 
 * SOLR-13912: Add 'countvals' aggregation in JSON FacetModule (hossman, Munendra S N)
 
-* SOLR-12217: Support shards.preference in SolrJ for single shard collections. The parameter 
+* SOLR-12217: Support shards.preference in SolrJ for single shard collections. The parameter
   is now used by the CloudSolrClient and Streaming Expressions. (Houston Putman, Tomas Fernandez-Lobbe)
 
 * SOLR-14043: Allow the precision Stream Evaluator to operate on matrices (Joel bernstein)
@@ -154,7 +156,7 @@ Improvements
 * SOLR-13957: Add sensible defaults for the facet, random, facet2D, timeseries, stats
   and update Streaming Expressions (Joel Bernstein)
 
-* SOLR-13904: Analytic component abandons requests exceedig a limit passed via timeAllowed parameter. 
+* SOLR-13904: Analytic component abandons requests exceedig a limit passed via timeAllowed parameter.
   (Houston Putman, Mikhail Khludnev).
 
 * SOLR-13970: Fail the request when collapsing or expand is used with Grouping. (Erick Erickson, Joel Bernstein, Munendra S N)
diff --git a/solr/server/scripts/cloud-scripts/zkcli.bat b/solr/server/scripts/cloud-scripts/zkcli.bat
index 67a1fd4..8b10b19 100644
--- a/solr/server/scripts/cloud-scripts/zkcli.bat
+++ b/solr/server/scripts/cloud-scripts/zkcli.bat
@@ -9,11 +9,7 @@ REM  Find location of this script
 set SDIR=%~dp0
 if "%SDIR:~-1%"=="\" set SDIR=%SDIR:~0,-1%
 
-if defined LOG4J_PROPS (
-  set "LOG4J_CONFIG=file:///%LOG4J_PROPS%"
-) else (
-  set "LOG4J_CONFIG=file:///%SDIR%\..\..\resources\log4j2-console.xml"
-)
+set "LOG4J_CONFIG=file:///%SDIR%\..\..\resources\log4j2-console.xml"
 
 REM Settings for ZK ACL
 REM set SOLR_ZK_CREDS_AND_ACLS=-DzkACLProvider=org.apache.solr.common.cloud.VMParamsAllAndReadonlyDigestZkACLProvider ^
diff --git a/solr/server/scripts/cloud-scripts/zkcli.sh b/solr/server/scripts/cloud-scripts/zkcli.sh
index 37b1ec9..844548a 100755
--- a/solr/server/scripts/cloud-scripts/zkcli.sh
+++ b/solr/server/scripts/cloud-scripts/zkcli.sh
@@ -9,11 +9,7 @@ JVM="java"
 
 sdir="`dirname \"$0\"`"
 
-if [ -n "$LOG4J_PROPS" ]; then
-  log4j_config="file:$LOG4J_PROPS"
-else
-  log4j_config="file:$sdir/../../resources/log4j2-console.xml"
-fi
+log4j_config="file:$sdir/../../resources/log4j2-console.xml"
 
 # Settings for ZK ACL
 #SOLR_ZK_CREDS_AND_ACLS="-DzkACLProvider=org.apache.solr.common.cloud.VMParamsAllAndReadonlyDigestZkACLProvider \