Changed: base-line JRUBY_OPTS to default to --dev

Fixes elastic#11355
AsherBond · Dec 3, 2019 · 84347a1 · 84347a1
1 parent 5d408cd
commit 84347a1
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/bin/logstash-keystore b/bin/logstash-keystore
@@ -6,6 +6,6 @@ setup
 
 # bin/logstash-keystore is a short lived ruby script thus we can use aggressive "faster starting JRuby options"
 # see https://github.com/jruby/jruby/wiki/Improving-startup-time
-export JRUBY_OPTS="$JRUBY_OPTS -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-noverify -X-C -Xcompile.invokedynamic=false"
+export JRUBY_OPTS="${JRUBY_OPTS---dev}"
 
 ruby_exec "${LOGSTASH_HOME}/lib/secretstore/cli.rb" "$@"
diff --git a/bin/logstash-plugin b/bin/logstash-plugin
@@ -6,6 +6,6 @@ setup
 
 # bin/logstash-plugin is a short lived ruby script thus we can use aggressive "faster starting JRuby options"
 # see https://github.com/jruby/jruby/wiki/Improving-startup-time
-export JRUBY_OPTS="$JRUBY_OPTS -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-noverify -X-C -Xcompile.invokedynamic=false"
+export JRUBY_OPTS="${JRUBY_OPTS---dev}"
 
 ruby_exec "${LOGSTASH_HOME}/lib/pluginmanager/main.rb" "$@"
diff --git a/bin/rspec b/bin/rspec
@@ -5,6 +5,6 @@ unset CDPATH
 setup
 
 # use faster starting JRuby options see https://github.com/jruby/jruby/wiki/Improving-startup-time
-export JRUBY_OPTS="$JRUBY_OPTS -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1"
+export JRUBY_OPTS="${JRUBY_OPTS---dev}"
 
 ruby_exec "${LOGSTASH_HOME}/lib/bootstrap/rspec.rb" "$@"
diff --git a/bin/ruby b/bin/ruby
@@ -12,7 +12,7 @@
 #   DEBUG=1 to output debugging information
 
 # use faster starting JRuby options see https://github.com/jruby/jruby/wiki/Improving-startup-time
-export JRUBY_OPTS="$JRUBY_OPTS -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1"
+export JRUBY_OPTS="${JRUBY_OPTS---dev}"
 
 unset CDPATH