mirror of
https://github.com/elastic/logstash.git
synced 2025-04-24 14:47:19 -04:00
Don't pass jruby opts explicitly
they are already passed via JAVA_OPTS environment variable. Fixes #5830
This commit is contained in:
parent
4f6d9d1c86
commit
3f6439fe52
1 changed files with 2 additions and 11 deletions
|
@ -135,15 +135,6 @@ setup_ruby() {
|
|||
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() {
|
||||
# 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
|
||||
|
@ -179,8 +170,8 @@ ruby_exec() {
|
|||
# $VENDORED_JRUBY is non-empty so use the vendored JRuby
|
||||
|
||||
if [ "$DEBUG" ] ; then
|
||||
echo "DEBUG: exec ${JRUBY_BIN} $(jruby_opts) $@"
|
||||
echo "DEBUG: exec ${JRUBY_BIN} $@"
|
||||
fi
|
||||
exec "${JRUBY_BIN}" $(jruby_opts) "$@"
|
||||
exec "${JRUBY_BIN}" "$@"
|
||||
fi
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue