diff options
| author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2015-01-06 14:27:09 +0100 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2015-01-06 14:27:09 +0100 |
| commit | cb4252ae90e3ab092b2eabb880914f47bbe88fba (patch) | |
| tree | 5bd58c5ec7da5b11acde6e7841f16e3ca964e908 /sonar-application | |
| parent | 34cff10aba416343d259a21d1f9ca92e1188bf0e (diff) | |
| download | sonarqube-cb4252ae90e3ab092b2eabb880914f47bbe88fba.tar.gz sonarqube-cb4252ae90e3ab092b2eabb880914f47bbe88fba.zip | |
Fix documentation of JVM server mode
Diffstat (limited to 'sonar-application')
| -rw-r--r-- | sonar-application/src/main/assembly/conf/sonar.properties | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sonar-application/src/main/assembly/conf/sonar.properties b/sonar-application/src/main/assembly/conf/sonar.properties index 324ed71e5f8..ec7691a1939 100644 --- a/sonar-application/src/main/assembly/conf/sonar.properties +++ b/sonar-application/src/main/assembly/conf/sonar.properties @@ -76,12 +76,12 @@ # WEB SERVER # Web server is executed in a dedicated Java process. By default its heap size is 768Mb. -# Use the following property to customize JVM options. Enabling the HotSpot Server VM -# mode (-server) is recommended. +# Use the following property to customize JVM options. +# The HotSpot Server VM is recommended. The property -server should be added if server mode +# is not enabled by default on your environment: http://docs.oracle.com/javase/7/docs/technotes/guides/vm/server-class.html #sonar.web.javaOpts=-Xmx768m -XX:MaxPermSize=160m -XX:+HeapDumpOnOutOfMemoryError -# Same as previous property, but allows to not repeat all other settings -# like -Djava.awt.headless=true +# Same as previous property, but allows to not repeat all other settings like -Xmx #sonar.web.javaAdditionalOpts= # Binding IP address. For servers with more than one IP address, this property specifies which @@ -182,13 +182,14 @@ # Elasticsearch is used to facilitate fast and accurate information retrieval. # It is executed in a dedicated Java process. -# JVM options. Note that enabling the HotSpot Server VM mode (-server) is recommended. +# JVM options +# The HotSpot Server VM is recommended. The property -server should be added if server mode +# is not enabled by default on your environment: http://docs.oracle.com/javase/7/docs/technotes/guides/vm/server-class.html #sonar.search.javaOpts=-Xmx1G -Xms256m -Xss256k -Djava.net.preferIPv4Stack=true \ # -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75 \ # -XX:+UseCMSInitiatingOccupancyOnly -XX:+HeapDumpOnOutOfMemoryError -# Same as previous property, but allows to not repeat all other settings -# like -Djava.awt.headless=true +# Same as previous property, but allows to not repeat all other settings like -Xmx #sonar.search.javaAdditionalOpts= # Elasticsearch port. Default is 9001. Use 0 to get a free port. |