SONAR-8435 add info message saying WebServer is operational to web.log

and modify message in Compute Engine to be "is operational" instead of "is up" for consistency

4 files changed, 8 insertions, 5 deletions

diff --git a/it/it-tests/src/test/java/it/serverSystem/ServerSystemTest.java b/it/it-tests/src/test/java/it/serverSystem/ServerSystemTest.java
index eb3e1c4f11c..3242a1ece0d 100644
--- a/it/it-tests/src/test/java/it/serverSystem/ServerSystemTest.java
+++ b/it/it-tests/src/test/java/it/serverSystem/ServerSystemTest.java
@@ -132,7 +132,7 @@ public class ServerSystemTest {
   private static void waitForComputeEngineToBeUp(Orchestrator orchestrator) throws IOException {
     for (int i = 0; i < 10_000; i++) {
       File logs = orchestrator.getServer().getCeLogs();
-      if (FileUtils.readFileToString(logs).contains("Compute Engine is up")) {
+      if (FileUtils.readFileToString(logs).contains("Compute Engine is operational")) {
         return;
       }
       try {
@@ -141,7 +141,7 @@ public class ServerSystemTest {
         // ignored
       }
     }
-    throw new IllegalStateException("Compute Engine is not up");
+    throw new IllegalStateException("Compute Engine is not operational");
   }
 
   /**
diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/app/CeServer.java b/server/sonar-ce/src/main/java/org/sonar/ce/app/CeServer.java
index ee1288ebca3..dd73aec0bf2 100644
--- a/server/sonar-ce/src/main/java/org/sonar/ce/app/CeServer.java
+++ b/server/sonar-ce/src/main/java/org/sonar/ce/app/CeServer.java
@@ -173,7 +173,7 @@ public class CeServer implements Monitored {
     private void startup() {
       LOG.info("Compute Engine starting up...");
       computeEngine.startup();
-      LOG.info("Compute Engine is up");
+      LOG.info("Compute Engine is operational");
     }
 
     private void waitForStopSignal() {
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/Platform.java b/server/sonar-server/src/main/java/org/sonar/server/platform/Platform.java
index 2622ab4d28a..4596c883b81 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/Platform.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/platform/Platform.java
@@ -120,7 +120,10 @@ public class Platform {
 
           runIfNotAborted(() -> executeStartupTasks(startup));
           // switch current container last to avoid giving access to a partially initialized container
-          runIfNotAborted(() -> currentLevel = level4);
+          runIfNotAborted(() -> {
+            currentLevel = level4;
+            LOGGER.info("WebServer is operational");
+          });
 
           // stop safemode container if it existed
           runIfNotAborted(Platform.this::stopSafeModeContainer);
diff --git a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/server/ServerTest.java b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/server/ServerTest.java
index 9aa7365a629..a4655e3ed1a 100644
--- a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/server/ServerTest.java
+++ b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/server/ServerTest.java
@@ -92,7 +92,7 @@ public class ServerTest extends PerfTestCase {
     Collections.reverse(lines);
     Date end = null;
     for (String line : lines) {
-      if (line.contains("Compute Engine is up")) {
+      if (line.contains("Compute Engine is operational")) {
         end = ServerLogs.extractDate(line);
         break;
       }