diff options
| author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2014-10-14 19:36:27 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2014-10-14 19:36:27 +0200 |
| commit | af11170992331c71020ff86db0e15b8bc09d44b5 (patch) | |
| tree | 3c01b0b2b69545a8b554d08606a1d52480e73b2c /sonar-application/src | |
| parent | 10d814b2819623c785e9752c5e30a50efc9ec546 (diff) | |
| download | sonarqube-af11170992331c71020ff86db0e15b8bc09d44b5.tar.gz sonarqube-af11170992331c71020ff86db0e15b8bc09d44b5.zip | |
SONAR-5710 remove duplicated JVM options in command-line
Diffstat (limited to 'sonar-application/src')
| -rw-r--r-- | sonar-application/src/main/java/org/sonar/application/DefaultSettings.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sonar-application/src/main/java/org/sonar/application/DefaultSettings.java b/sonar-application/src/main/java/org/sonar/application/DefaultSettings.java index 4a936789499..c905827db52 100644 --- a/sonar-application/src/main/java/org/sonar/application/DefaultSettings.java +++ b/sonar-application/src/main/java/org/sonar/application/DefaultSettings.java @@ -71,11 +71,10 @@ class DefaultSettings { defaults.put(CLUSTER_NAME, "sonarqube"); defaults.put(SEARCH_JAVA_OPTS, "-Xmx256m -Xms256m -Xss256k -Djava.net.preferIPv4Stack=true " + "-XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75 -XX:+UseCMSInitiatingOccupancyOnly " + - "-XX:+HeapDumpOnOutOfMemoryError -Djava.awt.headless=true"); + "-XX:+HeapDumpOnOutOfMemoryError"); defaults.put(SEARCH_JAVA_ADDITIONAL_OPTS, ""); defaults.put(CLUSTER_NODE_NAME, "sonar-" + System.currentTimeMillis()); - defaults.put(WEB_JAVA_OPTS, "-Xmx768m -XX:MaxPermSize=160m -XX:+HeapDumpOnOutOfMemoryError -Djava.net.preferIPv4Stack=true " + - "-Djava.awt.headless=true -Dfile.encoding=UTF-8 -Djruby.management.enabled=false"); + defaults.put(WEB_JAVA_OPTS, "-Xmx768m -XX:MaxPermSize=160m -XX:+HeapDumpOnOutOfMemoryError"); defaults.put(WEB_JAVA_ADDITIONAL_OPTS, ""); defaults.put(JDBC_URL, "jdbc:h2:tcp://localhost:9092/sonar"); defaults.put(JDBC_LOGIN, "sonar"); |