Added automatic heap settings for IX dyno

heroku · Oct 28, 2015 · 38fa92b · 38fa92b
1 parent 606c1aa
commit 38fa92b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/lib/language_pack/ruby.rb b/lib/language_pack/ruby.rb
@@ -207,6 +207,9 @@ def set_jvm_max_heap
 512)   # 2X Dyno
   JVM_MAX_HEAP=768
   ;;
+16384) # IX Dyno
+  JVM_MAX_HEAP=2048
+  ;;
 32768) # PX Dyno
   JVM_MAX_HEAP=5120
   ;;
@@ -244,7 +247,7 @@ def default_jruby_opts
   # default JAVA_TOOL_OPTIONS
   # return [String] string of JAVA_TOOL_OPTIONS
   def default_java_tool_options
-    "-Xmx${JVM_MAX_HEAP:-\"384\"}m -Djava.rmi.server.useCodebaseOnly=true"
+    "-Xmx${JVM_MAX_HEAP:-\"384\"}m"
   end
 
   # sets up the environment variables for the build process

diff --git a/spec/rubies_spec.rb b/spec/rubies_spec.rb
@@ -50,6 +50,7 @@
 
     app.deploy do |app|
       expect(app.output).to match("Installing JVM: openjdk-8")
+      expect(app.output).to match("Picked up JAVA_TOOL_OPTIONS: -Xmx2048m")
       expect(app.output).to match("JRUBY_OPTS is:  -Xcompile.invokedynamic=false")
       expect(app.output).not_to include("OpenJDK 64-Bit Server VM warning")