diff options
| author | Sébastien Lesaint <sebastien.lesaint@sonarsource.com> | 2016-03-15 14:04:41 +0100 |
|---|---|---|
| committer | Sébastien Lesaint <sebastien.lesaint@sonarsource.com> | 2016-03-21 16:44:05 +0100 |
| commit | 70d12b389773bfbe79c6d44ebb5ceca056565411 (patch) | |
| tree | 713e99d0d30b687418071d323994c67c5abf09c1 /server/sonar-process | |
| parent | 950454051f247863735b75d251bee8460c7e07be (diff) | |
| download | sonarqube-70d12b389773bfbe79c6d44ebb5ceca056565411.tar.gz sonarqube-70d12b389773bfbe79c6d44ebb5ceca056565411.zip | |
SONAR-7435 add sonar.ce.javaOpts and sonar.ce.javaAdditionalOpts
also enforce some JVM parameters
Diffstat (limited to 'server/sonar-process')
| -rw-r--r-- | server/sonar-process/src/main/java/org/sonar/process/ProcessProperties.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/server/sonar-process/src/main/java/org/sonar/process/ProcessProperties.java b/server/sonar-process/src/main/java/org/sonar/process/ProcessProperties.java index d2312154872..0f1efd0ce6f 100644 --- a/server/sonar-process/src/main/java/org/sonar/process/ProcessProperties.java +++ b/server/sonar-process/src/main/java/org/sonar/process/ProcessProperties.java @@ -60,6 +60,9 @@ public class ProcessProperties { public static final String WEB_JAVA_OPTS = "sonar.web.javaOpts"; public static final String WEB_JAVA_ADDITIONAL_OPTS = "sonar.web.javaAdditionalOpts"; + public static final String CE_JAVA_OPTS = "sonar.ce.javaOpts"; + public static final String CE_JAVA_ADDITIONAL_OPTS = "sonar.ce.javaAdditionalOpts"; + /** * Used by Orchestrator to ask for shutdown of monitor process */ @@ -74,6 +77,8 @@ public class ProcessProperties { // jruby is slow with java 8: https://jira.sonarsource.com/browse/SONAR-6115 "-Djruby.compile.invokedynamic=false"; + public static final String CE_ENFORCED_JVM_ARGS = "-Djava.awt.headless=true -Dfile.encoding=UTF-8"; + private ProcessProperties() { // only static stuff } @@ -111,6 +116,8 @@ public class ProcessProperties { defaults.put(ProcessProperties.WEB_JAVA_OPTS, "-Xmx768m -Xms256m -XX:MaxPermSize=160m -XX:+HeapDumpOnOutOfMemoryError -Djava.net.preferIPv4Stack=true"); defaults.put(ProcessProperties.WEB_JAVA_ADDITIONAL_OPTS, ""); + defaults.put(ProcessProperties.CE_JAVA_OPTS, "-Xmx768m -Xms256m -XX:MaxPermSize=160m -XX:+HeapDumpOnOutOfMemoryError -Djava.net.preferIPv4Stack=true"); + defaults.put(ProcessProperties.CE_JAVA_ADDITIONAL_OPTS, ""); defaults.put(ProcessProperties.JDBC_URL, "jdbc:h2:tcp://localhost:9092/sonar"); defaults.put(ProcessProperties.JDBC_MAX_ACTIVE, "60"); defaults.put(ProcessProperties.JDBC_MAX_IDLE, "5"); |