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

allow logstash to run in a dir with spaces

Browse source 
because HeapDumpPath is set, if it contains spaces the jruby_opts
function will create two strings appended by -J
even if the list of jruby opts is constructed using replacement
shell script will not escape the path correct to the heap dump path
option needs to be added as late as possible

this is a *nix fix only, windows is not affected

Fixes #4303
This commit is contained in:
Joao Duarte 2015-12-04 15:59:40 +00:00 • committed by Suyog Rao
parent c2ea4a7a6e
commit 44edf5bd00
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
bin/logstash.lib.sh
View file

@ -38,7 +38,8 @@ setup_java() {
# Causes the JVM to dump its heap on OutOfMemory. # Causes the JVM to dump its heap on OutOfMemory.
JAVA_OPTS="$JAVA_OPTS -XX:+HeapDumpOnOutOfMemoryError" JAVA_OPTS="$JAVA_OPTS -XX:+HeapDumpOnOutOfMemoryError"
# The path to the heap dump location # The path to the heap dump location
JAVA_OPTS="$JAVA_OPTS -XX:HeapDumpPath=${LOGSTASH_HOME}/heapdump.hprof" # This variable needs to be isolated since it may contain spaces
HEAP_DUMP_PATH="-XX:HeapDumpPath=${LOGSTASH_HOME}/heapdump.hprof"
fi fi
if [ "$LS_JAVA_OPTS" ] ; then if [ "$LS_JAVA_OPTS" ] ; then
@ -151,8 +152,8 @@ ruby_exec() {
# $VENDORED_JRUBY is non-empty so use the vendored JRuby # $VENDORED_JRUBY is non-empty so use the vendored JRuby
if [ "$DEBUG" ] ; then if [ "$DEBUG" ] ; then
echo "DEBUG: exec ${JRUBY_BIN} $(jruby_opts) $@" echo "DEBUG: exec ${JRUBY_BIN} $(jruby_opts) "-J$HEAP_DUMP_PATH" $@"
fi fi
exec "${JRUBY_BIN}" $(jruby_opts) "$@" exec "${JRUBY_BIN}" $(jruby_opts) "-J$HEAP_DUMP_PATH" "$@"
fi fi
} }