SONAR-4898 improve logging

2 files changed, 12 insertions, 33 deletions

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 afd335a06d3..f80d2591a5f 100644
--- a/sonar-application/src/main/java/org/sonar/application/App.java
+++ b/sonar-application/src/main/java/org/sonar/application/App.java
@@ -51,9 +51,7 @@ public class App implements ProcessMXBean {
     Thread shutdownHook = new Thread(new Runnable() {
       @Override
       public void run() {
-        LOGGER.info("JVM Shutdown start");
         terminate();
-        LOGGER.info("JVM Shutdown end");
       }
     });
     Runtime.getRuntime().addShutdownHook(shutdownHook);
@@ -73,6 +71,9 @@ public class App implements ProcessMXBean {
   }
 
   public void start() {
+    Logger logger = LoggerFactory.getLogger(getClass());
+
+    logger.info("Starting Elasticsearch");
     elasticsearch = new ProcessWrapper("ES")
       .setWorkDir(installation.homeDir())
       .setJmxPort(Integer.parseInt(installation.prop(DefaultSettings.ES_JMX_PORT_KEY)))
@@ -86,6 +87,7 @@ public class App implements ProcessMXBean {
       .execute();
     monitor.registerProcess(elasticsearch);
 
+    logger.info("Starting HTTP server");
     server = new ProcessWrapper("SQ")
       .setWorkDir(installation.homeDir())
       .setJmxPort(Integer.parseInt(installation.prop(DefaultSettings.WEB_JMX_PORT_KEY)))
@@ -103,15 +105,14 @@ public class App implements ProcessMXBean {
       .addClasspath(installation.starPath("lib/server"))
       .execute();
     monitor.registerProcess(server);
-
+    logger.info("HTTP server is Ready");
     monitor.start();
 
     try {
-      try {
-        monitor.join();
-      } catch (InterruptedException e) {
-        LOGGER.info("Monitor interrupted. Shutting down...");
-      }
+      monitor.join();
+    } catch (InterruptedException e) {
+      // TODO ignore ?
+
     } finally {
       terminate();
     }
@@ -120,6 +121,8 @@ public class App implements ProcessMXBean {
   @Override
   public void terminate() {
     if (monitor != null) {
+      Logger logger = LoggerFactory.getLogger(getClass());
+      logger.info("Shutting down server");
       monitor.interrupt();
       monitor = null;
       terminateAndWait(elasticsearch);
diff --git a/sonar-application/src/main/resources/org/sonar/application/logback.xml b/sonar-application/src/main/resources/org/sonar/application/logback.xml
index 993f5d097db..3d60682b514 100644
--- a/sonar-application/src/main/resources/org/sonar/application/logback.xml
+++ b/sonar-application/src/main/resources/org/sonar/application/logback.xml
@@ -9,24 +9,6 @@
 <configuration debug="false">
   <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator"/>
 
-  <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <File>${sonar.path.logs}/sonar.log</File>
-    <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <param name="FileNamePattern" value="${sonar.path.logs}/sonar.%i.log"/>
-      <param name="MinIndex" value="1"/>
-      <param name="MaxIndex" value="3"/>
-    </rollingPolicy>
-    <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-      <param name="MaxFileSize" value="5MB"/>
-    </triggeringPolicy>
-    <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-      <!-- Use %d{yyyy.MM.dd HH:mm:ss.SSS} to display milliseconds -->
-      <pattern>
-        %d{yyyy.MM.dd HH:mm:ss} %-5level [%logger{20}] %X %msg%n
-      </pattern>
-    </encoder>
-  </appender>
-
   <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
     <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
       <pattern>
@@ -35,11 +17,6 @@
     </encoder>
   </appender>
 
-
-  <logger name="console" additivity="false">
-    <appender-ref ref="CONSOLE"/>
-  </logger>
-
   <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
     <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
       <pattern>
@@ -49,8 +26,7 @@
   </appender>
 
   <root>
-    <level value="DEBUG"/>
-    <appender-ref ref="FILE"/>
+    <level value="INFO"/>
     <appender-ref ref="CONSOLE"/>
   </root>