From: Julien HENRY <julien.henry@sonarsource.com>
Date: Mon, 5 Oct 2015 10:43:22 +0000 (+0200)
Subject: Replace display of server id by permanent server id
X-Git-Tag: 5.2-RC1~73
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F568%2Fhead;p=sonarqube.git

Replace display of server id by permanent server id
---

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