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

Don't pass jruby opts explicitly

Browse source 
they are already passed via JAVA_OPTS environment variable.

Fixes #5830
This commit is contained in:
Bartłomiej Palmowski 2016-08-25 15:13:04 +01:00 • committed by Suyog Rao
parent 4f6d9d1c86
commit 3f6439fe52
1 changed files with 2 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
bin/logstash.lib.sh
View file

@ -135,15 +135,6 @@ setup_ruby() {
VENDORED_JRUBY= VENDORED_JRUBY=
} }
jruby_opts() {
printf "%s" "--1.9"
for i in $JAVA_OPTS ; do
if [ -z "$i" ]; then
printf "%s" " -J$i"
fi
done
}
setup() { setup() {
# first check if we want to use drip, which can be used in vendored jruby mode # first check if we want to use drip, which can be used in vendored jruby mode
# and also when setting USE_RUBY=1 if the ruby interpretor is in fact jruby # and also when setting USE_RUBY=1 if the ruby interpretor is in fact jruby
@ -179,8 +170,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} $@"
fi fi
exec "${JRUBY_BIN}" $(jruby_opts) "$@" exec "${JRUBY_BIN}" "$@"
fi fi
} }