From 209179891b33eee39219c648dcd2171f9b7789d8 Mon Sep 17 00:00:00 2001 From: Demian Katz Date: Fri, 26 Feb 2016 14:53:16 -0500 Subject: [PATCH] Inherit SOLR_LOGS_DIR from environment It is sometimes useful to override SOLR_LOGS_DIR from within a wrapping script; these changes make it possible while maintaining existing defaults. --- solr/bin/solr.cmd | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmd index bc4e76ac82cc..76c06f7b4ff3 100644 --- a/solr/bin/solr.cmd +++ b/solr/bin/solr.cmd @@ -655,13 +655,18 @@ IF "%STOP_KEY%"=="" set STOP_KEY=solrrocks @REM This is quite hacky, but examples rely on a different log4j.properties @REM so that we can write logs for examples to %SOLR_HOME%\..\logs -set "SOLR_LOGS_DIR=%SOLR_SERVER_DIR%\logs" set "EXAMPLE_DIR=%SOLR_TIP%\example" set LOG4J_CONFIG= set TMP=!SOLR_HOME:%EXAMPLE_DIR%=! IF NOT "%TMP%"=="%SOLR_HOME%" ( - set "SOLR_LOGS_DIR=%SOLR_HOME%\..\logs" + IF "%SOLR_LOGS_DIR%"=="" ( + set "SOLR_LOGS_DIR=%SOLR_HOME%\..\logs" + ) set "LOG4J_CONFIG=file:%EXAMPLE_DIR%\resources\log4j.properties" +) ELSE ( + IF "%SOLR_LOGS_DIR%"=="" ( + set "SOLR_LOGS_DIR=%SOLR_SERVER_DIR%\logs" + ) ) set IS_RESTART=0