diff options
| author | Julien HENRY <julien.henry@sonarsource.com> | 2015-10-05 12:43:22 +0200 |
|---|---|---|
| committer | Julien HENRY <julien.henry@sonarsource.com> | 2015-10-05 15:05:20 +0200 |
| commit | 1d800d7d984222c100ae389af3d9dc9242a1bad2 (patch) | |
| tree | c67ef3e8fb8d701fa1b00283f10c6251789d025b /sonar-batch | |
| parent | c72b33cd5dacb5ff177703b35d84a902bc0050f2 (diff) | |
| download | sonarqube-1d800d7d984222c100ae389af3d9dc9242a1bad2.tar.gz sonarqube-1d800d7d984222c100ae389af3d9dc9242a1bad2.zip | |
Replace display of server id by permanent server id
Diffstat (limited to 'sonar-batch')
| -rw-r--r-- | sonar-batch/src/main/java/org/sonar/batch/bootstrap/GlobalSettings.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/GlobalSettings.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/GlobalSettings.java index 4469efd3767..eaab0380b03 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/GlobalSettings.java +++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/GlobalSettings.java @@ -20,9 +20,7 @@ package org.sonar.batch.bootstrap; import com.google.common.collect.ImmutableMap; - import java.util.Map; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.sonar.api.CoreProperties; @@ -43,8 +41,7 @@ public class GlobalSettings extends Settings { private static final Map<String, String> DROPPED_PROPERTIES = ImmutableMap.of( "sonar.jdbc.url", JDBC_SPECIFIC_MESSAGE, "sonar.jdbc.username", JDBC_SPECIFIC_MESSAGE, - "sonar.jdbc.password", JDBC_SPECIFIC_MESSAGE - ); + "sonar.jdbc.password", JDBC_SPECIFIC_MESSAGE); private final GlobalProperties bootstrapProps; private final GlobalRepositories globalReferentials; @@ -66,7 +63,9 @@ public class GlobalSettings extends Settings { addProperties(globalReferentials.globalSettings()); addProperties(bootstrapProps.properties()); - LOG.info("Server id: " + getString(CoreProperties.SERVER_ID)); + if (hasKey(CoreProperties.PERMANENT_SERVER_ID)) { + LOG.info("Server id: " + getString(CoreProperties.PERMANENT_SERVER_ID)); + } } @Override |