summaryrefslogtreecommitdiffstats
path: root/server/sonar-search/src
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@sonarsource.com>2014-07-22 19:59:50 +0200
committerStephane Gamard <stephane.gamard@searchbox.com>2014-07-23 15:34:06 +0200
commit0c9d03f3aa048ebb6e147eb1d3fd341d0602bba7 (patch)
tree196271ec789d0462b279d6cb0e735db8d7961c60 /server/sonar-search/src
parent94445f214582872ae49e26e675a5483fb2352807 (diff)
downloadsonarqube-0c9d03f3aa048ebb6e147eb1d3fd341d0602bba7.tar.gz
sonarqube-0c9d03f3aa048ebb6e147eb1d3fd341d0602bba7.zip
SONAR-4898 some refactoring
Diffstat (limited to 'server/sonar-search/src')
-rw-r--r--server/sonar-search/src/main/java/org/sonar/search/ElasticSearch.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/server/sonar-search/src/main/java/org/sonar/search/ElasticSearch.java b/server/sonar-search/src/main/java/org/sonar/search/ElasticSearch.java
index c2c1b2bac96..ea1b4f95b15 100644
--- a/server/sonar-search/src/main/java/org/sonar/search/ElasticSearch.java
+++ b/server/sonar-search/src/main/java/org/sonar/search/ElasticSearch.java
@@ -34,11 +34,9 @@ import java.io.File;
public class ElasticSearch extends Process {
public static final String ES_DEBUG_PROPERTY = "esDebug";
- public static final String ES_PORT_PROPERTY = "sonar.es.node.port";
+ public static final String ES_PORT_PROPERTY = "sonar.es.port";
public static final String ES_CLUSTER_PROPERTY = "sonar.es.cluster.name";
- public static final String DEFAULT_CLUSTER_NAME = "sonarqube";
-
private Node node;
public ElasticSearch(String... args) {
@@ -121,7 +119,7 @@ public class ElasticSearch extends Process {
public void onStart() {
String dataDir = props.of("sonar.path.data");
Integer port = props.intOf(ES_PORT_PROPERTY);
- String clusterName = props.of(ES_CLUSTER_PROPERTY, DEFAULT_CLUSTER_NAME);
+ String clusterName = props.of(ES_CLUSTER_PROPERTY);
LoggerFactory.getLogger(ElasticSearch.class).info("Starting ES[{}] on port: {}", clusterName, port);