Permalink
Browse files

[FEATURE] Pull in any Java or JRuby environment variables that are al…

…ready set
  • Loading branch information...
1 parent 160e919 commit 79445965b32abadaed4fb9497199aa99b15c6c81 @taylor committed Jan 1, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 lib/aruba/jruby.rb
View
@@ -1,7 +1,7 @@
Aruba.configure do |config|
config.before_cmd do
# ideas taken from: http://blog.headius.com/2010/03/jruby-startup-time-tips.html
- set_env('JRUBY_OPTS', '-X-C') # disable JIT since these processes are so short lived
- set_env('JAVA_OPTS', '-d32') # force jRuby to use client JVM for faster startup times
+ set_env('JRUBY_OPTS', "-X-C #{ENV['JRUBY_OPTS']}") # disable JIT since these processes are so short lived
+ set_env('JAVA_OPTS', "-d32 #{ENV['JAVA_OPTS']}") # force jRuby to use client JVM for faster startup times
end
end

0 comments on commit 7944596

Please sign in to comment.