From 1d800d7d984222c100ae389af3d9dc9242a1bad2 Mon Sep 17 00:00:00 2001 From: Julien HENRY Date: Mon, 5 Oct 2015 12:43:22 +0200 Subject: [PATCH] Replace display of server id by permanent server id --- .../java/org/sonar/batch/bootstrap/GlobalSettings.java | 9 ++++----- 1 file 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 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 -- 2.39.5