From: Stephane Gamard <stephane.gamard@searchbox.com>
Date: Mon, 28 Jul 2014 09:58:31 +0000 (+0200)
Subject: SONAR-4898 - Integrated Logging class
X-Git-Tag: 4.5-RC1~347
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d1ab37abc38e07859840e69a8d0a0f9c133adc4d;p=sonarqube.git

SONAR-4898 - Integrated Logging class
---

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 d0ff82cb8ac..71e84c4e585 100644
--- a/sonar-application/src/main/java/org/sonar/application/App.java
+++ b/sonar-application/src/main/java/org/sonar/application/App.java
@@ -72,7 +72,9 @@ public class App implements ProcessMXBean {
 
   public void start() {
 
-    LOGGER.info("Starting search server");
+    Logger logger = LoggerFactory.getLogger(getClass());
+
+    logger.info("Starting search server");
     elasticsearch = new ProcessWrapper(SONAR_SEARCH_PROCESS)
       .setWorkDir(installation.homeDir())
       .setJmxPort(Integer.parseInt(installation.prop(DefaultSettings.ES_JMX_PORT_KEY)))
@@ -85,9 +87,9 @@ public class App implements ProcessMXBean {
       .addClasspath(installation.starPath("lib/search"))
       .execute();
     monitor.registerProcess(elasticsearch);
-    LOGGER.info("Search server is ready");
+    logger.info("Search server is ready");
 
-    LOGGER.info("Starting web server");
+    logger.info("Starting web server");
     server = new ProcessWrapper(SONAR_WEB_PROCESS)
       .setWorkDir(installation.homeDir())
       .setJmxPort(Integer.parseInt(installation.prop(DefaultSettings.WEB_JMX_PORT_KEY)))
@@ -105,7 +107,7 @@ public class App implements ProcessMXBean {
       .addClasspath(installation.starPath("lib/server"))
       .execute();
     monitor.registerProcess(server);
-    LOGGER.info("Web server is ready");
+    logger.info("Web server is ready");
 
     monitor.start();
 
@@ -122,6 +124,8 @@ public class App implements ProcessMXBean {
 
   @Override
   public void terminate() {
+    Logger logger = LoggerFactory.getLogger(getClass());
+
     if (monitor != null) {
       monitor.interrupt();
       monitor = null;
@@ -131,7 +135,7 @@ public class App implements ProcessMXBean {
       if (server != null) {
         server.terminate();
       }
-      LOGGER.info("Stopping SonarQube main process");
+      logger.info("Stopping SonarQube main process");
     }
   }