Merge pull request #47 from takai/allow_jpi_server_to_pass_opts

Allow jpi server to pass options
2012-04-24 21:42:16 -07:00 · 2012-04-24 21:42:16 -07:00 · b0fb641e22
parent 3cc659295d a01a77e916
commit b0fb641e22
1 changed files with 2 additions and 0 deletions
--- a/ruby-tools/jpi/lib/jenkins/plugin/tools/server.rb
+++ b/ruby-tools/jpi/lib/jenkins/plugin/tools/server.rb
@ -45,8 +45,10 @@ module Jenkins
          args << "-Ddebug.YUI=true"
 #          args << "-Djruby.debug.loadService=true"
 #          args << "-Djruby.debug.loadService.timing=true"
+          args << ENV['JAVA_OPTS'] if ENV.key? 'JAVA_OPTS'
          args << "-jar"
          args << @war
+          args << ENV['JENKINS_OPTS'] if ENV.key? 'JENKINS_OPTS'
          exec args.join(' ')
        end
      end