aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-application/src
diff options
context:
space:
mode:
authorDaniel Schwarz <daniel.schwarz@sonarsource.com>2017-08-22 11:10:25 +0200
committerSimon Brandhof <simon.brandhof@sonarsource.com>2017-09-05 14:24:13 +0200
commit2c35d9b2f0597289e526c615c720431314b25f43 (patch)
tree18c47db5a61a842746fdadae4c5b96598419fd41 /sonar-application/src
parent3ad9508d1ffa61cd9361f3af24aaeb1da5b0f38a (diff)
downloadsonarqube-2c35d9b2f0597289e526c615c720431314b25f43.tar.gz
sonarqube-2c35d9b2f0597289e526c615c720431314b25f43.zip
SONAR-9738 Fail if the cluster name differs from node to node
Diffstat (limited to 'sonar-application/src')
-rw-r--r--sonar-application/src/main/java/org/sonar/application/App.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/sonar-application/src/main/java/org/sonar/application/App.java b/sonar-application/src/main/java/org/sonar/application/App.java
index 123467455ee..ad3710088ce 100644
--- a/sonar-application/src/main/java/org/sonar/application/App.java
+++ b/sonar-application/src/main/java/org/sonar/application/App.java
@@ -32,6 +32,7 @@ import org.sonar.application.process.StopRequestWatcherImpl;
import org.sonar.process.SystemExit;
import static org.sonar.application.config.SonarQubeVersionHelper.getSonarqubeVersion;
+import static org.sonar.process.ProcessProperties.CLUSTER_NAME;
public class App {
@@ -48,6 +49,7 @@ public class App {
try (AppState appState = new AppStateFactory(settings).create()) {
appState.registerSonarQubeVersion(getSonarqubeVersion());
+ appState.registerClusterName(settings.getProps().value(CLUSTER_NAME, "sonarqube"));
AppReloader appReloader = new AppReloaderImpl(settingsLoader, fileSystem, appState, logging);
fileSystem.reset();
CommandFactory commandFactory = new CommandFactoryImpl(settings.getProps(), fileSystem.getTempDir());