From 70dfdc0bdcff5bfd6924c2832c5fdff69d1f201a Mon Sep 17 00:00:00 2001 From: Stephane Gamard Date: Mon, 25 Aug 2014 16:00:18 +0200 Subject: Disable process monitoring when in debug with agentlib:jdwt --- .../src/main/java/org/sonar/search/SearchServer.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'server/sonar-search') diff --git a/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java b/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java index 500665221fc..aecfb401eda 100644 --- a/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java +++ b/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java @@ -21,6 +21,7 @@ package org.sonar.search; import org.apache.commons.lang.StringUtils; import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus; +import org.elasticsearch.common.annotations.VisibleForTesting; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.node.Node; @@ -58,7 +59,8 @@ public class SearchServer extends MonitoredProcess { private Node node; - public SearchServer(final Props props, boolean monitored, boolean blocking) { + @VisibleForTesting + SearchServer(final Props props, boolean monitored, boolean blocking) { super(props, monitored); this.isBlocking = blocking; @@ -71,7 +73,14 @@ public class SearchServer extends MonitoredProcess { } public SearchServer(Props props) { - this(props, true, true); + super(props); + this.isBlocking = false; + new MinimumViableSystem().check(); + + String esNodesInets = props.of(ES_CLUSTER_INET); + if (StringUtils.isNotEmpty(esNodesInets)) { + Collections.addAll(nodes, esNodesInets.split(",")); + } } @Override -- cgit v1.2.3