aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-application/src/main/java
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@sonarsource.com>2016-07-29 22:21:58 +0200
committerSimon Brandhof <simon.brandhof@sonarsource.com>2016-08-03 17:57:17 +0200
commit17f3a477fd6119172c89057acb80693af21c5ae6 (patch)
tree32ecaba4d5b431b8ce95da9b193b0f313d2e0d70 /sonar-application/src/main/java
parent0b2c0f53b5dafce8453a8a0203f595d9bba44a6f (diff)
downloadsonarqube-17f3a477fd6119172c89057acb80693af21c5ae6.tar.gz
sonarqube-17f3a477fd6119172c89057acb80693af21c5ae6.zip
SONAR-7909 support sonar.cluster.ce.disabled
Diffstat (limited to 'sonar-application/src/main/java')
-rw-r--r--sonar-application/src/main/java/org/sonar/application/App.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/sonar-application/src/main/java/org/sonar/application/App.java b/sonar-application/src/main/java/org/sonar/application/App.java
index 057386624ea..fcb41a63698 100644
--- a/sonar-application/src/main/java/org/sonar/application/App.java
+++ b/sonar-application/src/main/java/org/sonar/application/App.java
@@ -62,7 +62,9 @@ public class App implements Stoppable {
// do not yet start WebServer nor CE on elasticsearch slaves
if (StringUtils.isBlank(props.value(ProcessProperties.CLUSTER_MASTER_HOST))) {
commands.add(createWebServerCommand(props, homeDir));
- commands.add(createCeServerCommand(props, homeDir));
+ if (!props.valueAsBoolean(ProcessProperties.CLUSTER_CE_DISABLED)) {
+ commands.add(createCeServerCommand(props, homeDir));
+ }
}
return commands;