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-process-monitor/src/main/java/org | |
| 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-process-monitor/src/main/java/org')
| -rw-r--r-- | server/sonar-process-monitor/src/main/java/org/sonar/application/cluster/ClusterProperties.java | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/cluster/ClusterProperties.java b/server/sonar-process-monitor/src/main/java/org/sonar/application/cluster/ClusterProperties.java index 661919efbd9..e8287c24d74 100644 --- a/server/sonar-process-monitor/src/main/java/org/sonar/application/cluster/ClusterProperties.java +++ b/server/sonar-process-monitor/src/main/java/org/sonar/application/cluster/ClusterProperties.java @@ -52,7 +52,7 @@ public final class ClusterProperties { networkInterfaces = extractNetworkInterfaces( appSettings.getProps().value(ProcessProperties.CLUSTER_NETWORK_INTERFACES, "") ); - name = appSettings.getProps().value(ProcessProperties.CLUSTER_NAME); + name = appSettings.getProps().nonNullValue(ProcessProperties.CLUSTER_NAME); hosts = extractHosts( appSettings.getProps().value(ProcessProperties.CLUSTER_HOSTS, "") ); @@ -82,13 +82,6 @@ public final class ClusterProperties { if (!enabled) { return; } - // Name is required in cluster mode - checkArgument( - StringUtils.isNotEmpty(name), - "Cluster have been enabled but a %s has not been defined.", - ProcessProperties.CLUSTER_NAME - ); - // Test validity of port checkArgument( port > 0 && port < 65_536, |