From 1be85fe80d23502a0cc0f61a6d53b50dc32c0ceb Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Wed, 30 Jul 2014 18:04:58 +0200
Subject: SONAR-4898 fix logs

---
 sonar-application/src/main/java/org/sonar/application/App.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'sonar-application/src/main/java/org/sonar/application')

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 daf1e53c205..dcfa2126811 100644
--- a/sonar-application/src/main/java/org/sonar/application/App.java
+++ b/sonar-application/src/main/java/org/sonar/application/App.java
@@ -60,7 +60,7 @@ public class App implements ProcessMXBean {
       if (elasticsearch.execute()) {
         monitor.registerProcess(elasticsearch);
         if (elasticsearch.waitForReady()) {
-          logger.info("Search server is ready");
+          logger.info("search server is up");
 
           server = new ProcessWrapper(JmxUtils.WEB_SERVER_NAME)
             .setWorkDir(installation.homeDir())
@@ -81,7 +81,7 @@ public class App implements ProcessMXBean {
             monitor.registerProcess(server);
             if (server.waitForReady()) {
               success = true;
-              logger.info("Web server is ready");
+              logger.info("web server is up");
               monitor.join();
             }
           }
@@ -104,7 +104,6 @@ public class App implements ProcessMXBean {
 
   @Override
   public void terminate() {
-    LoggerFactory.getLogger(App.class).info("Stopping");
     if (monitor != null && monitor.isAlive()) {
       monitor.terminate();
       monitor.interrupt();
@@ -128,7 +127,11 @@ public class App implements ProcessMXBean {
     Installation installation = new Installation();
     new AppLogging().configure(installation);
     App app = new App(installation);
+
+    // start and wait for shutdown command
     app.start();
+
+    LoggerFactory.getLogger(App.class).info("stopped");
     System.exit(app.isSuccess() ? 0 : 1);
   }
 }
-- 
cgit v1.2.3