public class SearchServer extends MonitoredProcess {
+ public static final String SONAR_NODE_NAME = "sonar.node.name";
public static final String ES_PORT_PROPERTY = "sonar.search.port";
public static final String ES_CLUSTER_PROPERTY = "sonar.cluster.name";
public static final String ES_CLUSTER_INET = "sonar.cluster.master";
// Set cluster coordinates
esSettings.put("cluster.name", clusterName);
- try {
- esSettings.put("node.name", InetAddress.getLocalHost().getHostName());
- } catch (Exception e) {
- esSettings.put("node.name", "sq-" + System.currentTimeMillis());
+ if (props.contains(SONAR_NODE_NAME)) {
+ esSettings.put("node.name", props.of(SONAR_NODE_NAME));
+ } else {
+ try {
+ esSettings.put("node.name", InetAddress.getLocalHost().getHostName());
+ } catch (Exception e) {
+ esSettings.put("node.name", "sq-" + System.currentTimeMillis());
+ }
}
// Make sure the index settings are up to date.
public static final String TYPE = "sonar.search.type";
public static final String HTTP_PORT = "sonar.search.http.port";
public static final String NODE_PORT = "sonar.search.port";
- public static final String CLUSTER_NAME = "sonar.search.cluster.name";
+ public static final String CLUSTER_NAME = "sonar.cluster.name";
+ public static final String NODE_NAME = "sonar.node.name";
}
.addJavaOpts(String.format("-Dsonar.path.logs=%s", installation.logsDir().getAbsolutePath()))
.setClassName("org.sonar.search.SearchServer")
.addProperties(installation.props().rawProperties())
+ .addProperty(DefaultSettings.SONAR_NODE_NAME, installation.prop(DefaultSettings.SONAR_NODE_NAME, DefaultSettings.getNonSetNodeName()))
.addClasspath(installation.starPath("lib/common"))
.addClasspath(installation.starPath("lib/search"));
if (elasticsearch.execute()) {
.addJavaOpts(String.format("-Dsonar.path.logs=%s", installation.logsDir().getAbsolutePath()))
.setClassName("org.sonar.server.app.WebServer")
.addProperties(installation.props().rawProperties())
+ .addProperty(DefaultSettings.SONAR_NODE_NAME, installation.prop(DefaultSettings.SONAR_NODE_NAME, DefaultSettings.getNonSetNodeName()))
.addClasspath(installation.starPath("extensions/jdbc-driver/mysql"))
.addClasspath(installation.starPath("extensions/jdbc-driver/mssql"))
.addClasspath(installation.starPath("extensions/jdbc-driver/oracle"))
// only static stuff
}
+ static final String SONAR_NODE_NAME = "sonar.node.name";
+
+ static String getNonSetNodeName() {
+ return "sonar-" + System.currentTimeMillis();
+ }
+
static final String SONAR_CLUSTER_MASTER = "sonar.cluster.master";
static final String PATH_LOGS_KEY = "sonar.path.logs";