SONAR-4898 improve logging configuration

2 files changed, 42 insertions, 9 deletions

diff --git a/server/sonar-search/src/main/java/org/sonar/search/ElasticSearch.java b/server/sonar-search/src/main/java/org/sonar/search/ElasticSearch.java
index 2b71844183c..1ea426d399e 100644
--- a/server/sonar-search/src/main/java/org/sonar/search/ElasticSearch.java
+++ b/server/sonar-search/src/main/java/org/sonar/search/ElasticSearch.java
@@ -25,6 +25,7 @@ import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.node.Node;
 import org.elasticsearch.node.NodeBuilder;
 import org.slf4j.LoggerFactory;
+import org.sonar.process.ConfigurationUtils;
 import org.sonar.process.Process;
 import org.sonar.process.Props;
 import org.sonar.search.script.ListUpdate;
@@ -39,11 +40,7 @@ public class ElasticSearch extends Process {
 
   private Node node;
 
-  public ElasticSearch(String... args) {
-    super(args);
-  }
-
-  public ElasticSearch(Props props) {
+  ElasticSearch(Props props) {
     super(props);
   }
 
@@ -56,7 +53,6 @@ public class ElasticSearch extends Process {
         .get()
         .getStatus() != ClusterHealthStatus.RED);
     } catch (Exception e) {
-      //LOGGER.warn("ES is not ready yet.", e);
       return false;
     }
   }
@@ -177,8 +173,7 @@ public class ElasticSearch extends Process {
   }
 
   public static void main(String... args) throws InterruptedException {
-    final ElasticSearch elasticSearch = new ElasticSearch(args);
-    elasticSearch.start();
-    LOGGER.info("ElasticSearch is done.");
+    Props props = ConfigurationUtils.loadPropsFromCommandLineArgs(args);
+    new ElasticSearch(props).start();
   }
 }
diff --git a/server/sonar-search/src/test/resources/logback-test.xml b/server/sonar-search/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..ff2270cc122
--- /dev/null
+++ b/server/sonar-search/src/test/resources/logback-test.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--
+  Configuration for default logger. Only used while embedded server is starting,
+  before proper logging configuration is loaded.
+
+  See http://logback.qos.ch/manual/configuration.html
+-->
+<configuration debug="false">
+  <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator"/>
+
+  <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+    <filter class="ch.qos.logback.classic.filter.LevelFilter">
+      <level>INFO</level>
+      <onMatch>ACCEPT</onMatch>
+      <onMismatch>DENY</onMismatch>
+    </filter>
+    <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+      <pattern>
+        %d{yyyy.MM.dd HH:mm:ss} %-5level %msg%n
+      </pattern>
+    </encoder>
+  </appender>
+
+  <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+      <pattern>
+        %d{yyyy.MM.dd HH:mm:ss} %-5level %msg%n
+      </pattern>
+    </encoder>
+  </appender>
+
+  <root>
+    <level value="DEBUG"/>
+    <appender-ref ref="CONSOLE"/>
+  </root>
+
+</configuration>