diff options
| author | Stephane Gamard <stephane.gamard@searchbox.com> | 2014-07-29 17:43:06 +0200 |
|---|---|---|
| committer | Stephane Gamard <stephane.gamard@searchbox.com> | 2014-07-29 17:43:06 +0200 |
| commit | 20688b88774a2809c5a88d786cf38fae49de0388 (patch) | |
| tree | 1e49793e2f882a2fd4137b65437f8dba06158e15 | |
| parent | 24f91ddaafa5dd4e6061d9c0e77e8e6b9e1997ee (diff) | |
| download | sonarqube-20688b88774a2809c5a88d786cf38fae49de0388.tar.gz sonarqube-20688b88774a2809c5a88d786cf38fae49de0388.zip | |
SONAR-5237 - Fixed exit of runner when TC Fails to load
3 files changed, 5 insertions, 3 deletions
diff --git a/server/sonar-server/src/main/java/org/sonar/server/app/EmbeddedTomcat.java b/server/sonar-server/src/main/java/org/sonar/server/app/EmbeddedTomcat.java index fe4be041682..32f323c96ee 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/app/EmbeddedTomcat.java +++ b/server/sonar-server/src/main/java/org/sonar/server/app/EmbeddedTomcat.java @@ -71,6 +71,7 @@ class EmbeddedTomcat { } catch (Exception e) { throw new IllegalStateException("Fail to start web server", e); } + stop(); } private File tomcatBasedir() { diff --git a/sonar-application/src/main/assembly/conf/sonar.properties b/sonar-application/src/main/assembly/conf/sonar.properties index 340a8525178..9e2dd261d30 100644 --- a/sonar-application/src/main/assembly/conf/sonar.properties +++ b/sonar-application/src/main/assembly/conf/sonar.properties @@ -8,7 +8,7 @@ #-------------------------------------------------------------------------------------------------- # TO BE DOCUMENTED - WORK IN PROGRESS -#sonar.search.javaOpts=-Djava.net.preferIPv4Stack=true -server -Xmx256m -Xms256m -Xss256k -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75 -XX:+UseCMSInitiatingOccupancyOnly +sonar.search.javaOpts=-Djava.net.preferIPv4Stack=true -Djava.awt.headless=true -Xmx256m -Xms256m -Xss256k -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75 -XX:+UseCMSInitiatingOccupancyOnly #sonar.search.port=9001 #sonar.search.jmxPort=9002 diff --git a/sonar-application/src/main/assembly/lib/jsw/wrapper.conf b/sonar-application/src/main/assembly/lib/jsw/wrapper.conf index 4ade5ff2937..77444e18905 100644 --- a/sonar-application/src/main/assembly/lib/jsw/wrapper.conf +++ b/sonar-application/src/main/assembly/lib/jsw/wrapper.conf @@ -7,10 +7,11 @@ wrapper.java.command=java # Java Additional Parameters -wrapper.java.additional.1=-Xmx16m +wrapper.java.additional.1=-Xmx32m +wrapper.java.additional.2=-Djava.awt.headless=true # Initial JVM heap size (in MB) -wrapper.java.initmemory=16 +wrapper.java.initmemory=32 # Java Main class. This class must implement the WrapperListener interface # or guarantee that the WrapperManager class is initialized. Helper |