github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 22:57:16 -04:00
Code Issues Projects Releases Packages Wiki Activity

Support ( in path and actually set JAVA_OPTS

Browse source 
The current logic for printing %JAVA_HOME% inside if ( ) block failes if the path contains a `(` which is the case for 32bit java (`C:\Program Files (x86)\java\jdk`)

The current logic for appending to JAVA_OPTS does not work as it will be expanded while interpreting the else block. Use goto instead.

Fixes #5214
This commit is contained in:
Bernd 2016-04-27 23:00:54 +02:00 • committed by Suyog Rao
parent 1a740c8879
commit 3e4cb0e20e
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
bin/setup.bat
View file

@ -19,9 +19,8 @@ if not defined JAVA_HOME IF EXIST %ProgramData%\Oracle\java\javapath\java.exe (
for /f "tokens=2 delims=[]" %%a in ('dir %ProgramData%\Oracle\java\javapath\java.exe') do @set JAVA_EXE=%%a for /f "tokens=2 delims=[]" %%a in ('dir %ProgramData%\Oracle\java\javapath\java.exe') do @set JAVA_EXE=%%a
) )
if defined JAVA_EXE set JAVA_HOME=%JAVA_EXE:\bin\java.exe=% if defined JAVA_EXE set JAVA_HOME=%JAVA_EXE:\bin\java.exe=%
if defined JAVA_EXE ( if defined JAVA_EXE echo Using JAVA_HOME=%JAVA_HOME% retrieved from %ProgramData%\Oracle\java\javapath\java.exe
echo Using JAVA_HOME=%JAVA_HOME% retrieved from %ProgramData%\Oracle\java\javapath\java.exe
)
if not defined JAVA_HOME goto missing_java_home if not defined JAVA_HOME goto missing_java_home
REM ***** JAVA options ***** REM ***** JAVA options *****
@ -31,7 +30,9 @@ if "%LS_HEAP_SIZE%" == "" (
IF NOT "%JAVA_OPTS%" == "" ( IF NOT "%JAVA_OPTS%" == "" (
ECHO JAVA_OPTS was set to [%JAVA_OPTS%]. Logstash will trust these options, and not set any defaults that it might usually set ECHO JAVA_OPTS was set to [%JAVA_OPTS%]. Logstash will trust these options, and not set any defaults that it might usually set
) ELSE ( goto opts_defined
)
SET JAVA_OPTS=%JAVA_OPTS% -Xmx%LS_HEAP_SIZE% SET JAVA_OPTS=%JAVA_OPTS% -Xmx%LS_HEAP_SIZE%
REM Enable aggressive optimizations in the JVM REM Enable aggressive optimizations in the JVM
@ -59,7 +60,8 @@ IF NOT "%JAVA_OPTS%" == "" (
REM The path to the heap dump location, note directory must exists and have enough REM The path to the heap dump location, note directory must exists and have enough
REM space for a full heap dump. REM space for a full heap dump.
SET JAVA_OPTS=%JAVA_OPTS% -XX:HeapDumpPath="$LS_HOME/heapdump.hprof" SET JAVA_OPTS=%JAVA_OPTS% -XX:HeapDumpPath="$LS_HOME/heapdump.hprof"
) :opts_defined
IF NOT "%LS_JAVA_OPTS%" == "" ( IF NOT "%LS_JAVA_OPTS%" == "" (
ECHO LS_JAVA_OPTS was set to [%LS_JAVA_OPTS%]. This will be appended to the JAVA_OPTS [%JAVA_OPTS%] ECHO LS_JAVA_OPTS was set to [%LS_JAVA_OPTS%]. This will be appended to the JAVA_OPTS [%JAVA_OPTS%]