diff options
| author | Eric Hartmann <hartmann.eric@gmail.Com> | 2017-03-17 17:54:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-17 17:54:14 +0100 |
| commit | b35205ac59d363548b245b3ec8ed742a68fbf22a (patch) | |
| tree | 9c2e878e37396071a0b7013e5c028c8ec1bd456b /server/sonar-search/src/main | |
| parent | 8759b3933d8bc4a147b7242e1838a39b82bcc719 (diff) | |
| download | sonarqube-b35205ac59d363548b245b3ec8ed742a68fbf22a.tar.gz sonarqube-b35205ac59d363548b245b3ec8ed742a68fbf22a.zip | |
SONAR-8938 Remove sonar.search.clusterName in favor of sonar.cluster.name (#1795)
Diffstat (limited to 'server/sonar-search/src/main')
| -rw-r--r-- | server/sonar-search/src/main/java/org/sonar/search/EsSettings.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/server/sonar-search/src/main/java/org/sonar/search/EsSettings.java b/server/sonar-search/src/main/java/org/sonar/search/EsSettings.java index 36369295ac7..9abb06eb258 100644 --- a/server/sonar-search/src/main/java/org/sonar/search/EsSettings.java +++ b/server/sonar-search/src/main/java/org/sonar/search/EsSettings.java @@ -49,9 +49,8 @@ public class EsSettings implements EsSettingsMBean { EsSettings(Props props) { this.props = props; - // name of ES cluster must always be set, even if clustering of SQ is disabled - this.clusterName = props.nonNullValue(ProcessProperties.SEARCH_CLUSTER_NAME); + this.clusterName = props.nonNullValue(ProcessProperties.CLUSTER_NAME); this.clusterEnabled = props.valueAsBoolean(ProcessProperties.CLUSTER_ENABLED); if (this.clusterEnabled) { this.nodeName = props.value(CLUSTER_SEARCH_NODE_NAME, "sonarqube-" + UUID.randomUUID().toString()); |