github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-25 07:07:54 -04:00
Code Issues Projects Releases Packages Wiki Activity

Permit relative path or $PATH searches for the java command.

Browse source 
This fixes the following broken in #1189:

    % bin/logstash
    => Could not find any executable java binary. Please install java in your PATH or set JAVA_HOME.
This commit is contained in:
Jordan Sissel 2014-04-16 12:35:35 -07:00
parent bfc76195dc
commit c4712971ca
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
bin/logstash.lib.sh
View file

@ -21,13 +21,11 @@ setup_java() {
else else
JAVACMD="java" JAVACMD="java"
fi fi
else
JAVACMD=$(which $JAVACMD 2>/dev/null)
fi fi
if [ "$(basename $JAVACMD)" = "drip" ] ; then # Resolve full path to the java command.
export DRIP_INIT_CLASS="org.jruby.main.DripMain" if [ ! -f "$JAVACMD" ] ; then
export DRIP_INIT= JAVACMD=$(which $JAVACMD 2>/dev/null)
fi fi
if [ ! -x "$JAVACMD" ] ; then if [ ! -x "$JAVACMD" ] ; then
@ -35,6 +33,11 @@ setup_java() {
exit 1 exit 1
fi fi
if [ "$(basename $JAVACMD)" = "drip" ] ; then
export DRIP_INIT_CLASS="org.jruby.main.DripMain"
export DRIP_INIT=
fi
JAVA_OPTS="$JAVA_OPTS -Xmx${LS_HEAP_SIZE}" JAVA_OPTS="$JAVA_OPTS -Xmx${LS_HEAP_SIZE}"
JAVA_OPTS="$JAVA_OPTS -XX:+UseParNewGC" JAVA_OPTS="$JAVA_OPTS -XX:+UseParNewGC"
JAVA_OPTS="$JAVA_OPTS -XX:+UseConcMarkSweepGC" JAVA_OPTS="$JAVA_OPTS -XX:+UseConcMarkSweepGC"