diff options
| author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2014-10-09 07:35:11 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2014-10-09 07:35:11 +0200 |
| commit | 1f9c79116054ce696871143403f2491ce410e39b (patch) | |
| tree | 202f80b717bd86fc7ea0e8900df7d9b7350252aa /sonar-application/src/main/java | |
| parent | 3794337ce0d72a52a8d73299cc74a46962a2c2b7 (diff) | |
| download | sonarqube-1f9c79116054ce696871143403f2491ce410e39b.tar.gz sonarqube-1f9c79116054ce696871143403f2491ce410e39b.zip | |
SONAR-5687 refactor configuration of cluster
Diffstat (limited to 'sonar-application/src/main/java')
| -rw-r--r-- | sonar-application/src/main/java/org/sonar/application/App.java | 4 |
1 files changed, 2 insertions, 2 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 f0a859435ef..b70b2666de1 100644 --- a/sonar-application/src/main/java/org/sonar/application/App.java +++ b/sonar-application/src/main/java/org/sonar/application/App.java @@ -81,8 +81,8 @@ public class App implements Stoppable { .addClasspath("./lib/search/*"); commands.add(elasticsearch); - // do not yet start SQ in cluster mode. See SONAR-5483 & SONAR-5391 - if (StringUtils.isEmpty(props.value(ProcessConstants.CLUSTER_MASTER_HOSTS))) { + // do not yet start SQ on elasticsearch slaves + if (StringUtils.isBlank(props.value(ProcessConstants.CLUSTER_MASTER_HOST))) { JavaCommand webServer = new JavaCommand("web") .setWorkDir(homeDir) .addJavaOptions("-Djava.awt.headless=true -Dfile.encoding=UTF-8 -Djruby.management.enabled=false") |