aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-application/src
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@sonarsource.com>2014-07-28 11:44:34 +0200
committerSimon Brandhof <simon.brandhof@sonarsource.com>2014-07-28 11:45:08 +0200
commitee22775511a450b165b3543d77522a7dbada3908 (patch)
tree25b50d34251151e7fc8890b1c436b2a7bee471c0 /sonar-application/src
parent0f9d1f97155997b814a90dbb3914935ab4590f76 (diff)
downloadsonarqube-ee22775511a450b165b3543d77522a7dbada3908.tar.gz
sonarqube-ee22775511a450b165b3543d77522a7dbada3908.zip
SONAR-4898 fix app logging
Diffstat (limited to 'sonar-application/src')
-rw-r--r--sonar-application/src/main/java/org/sonar/application/App.java4
-rw-r--r--sonar-application/src/main/resources/org/sonar/application/logback.xml46
2 files changed, 1 insertions, 49 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 fc68b9d5e09..d0ff82cb8ac 100644
--- a/sonar-application/src/main/java/org/sonar/application/App.java
+++ b/sonar-application/src/main/java/org/sonar/application/App.java
@@ -45,8 +45,6 @@ public class App implements ProcessMXBean {
private ProcessWrapper elasticsearch;
private ProcessWrapper server;
- private static Logger LOGGER = LoggerFactory.getLogger(App.class);
-
public App(Installation installation) throws Exception {
this.installation = installation;
@@ -117,7 +115,7 @@ public class App implements ProcessMXBean {
// TODO ignore ?
} finally {
- LOGGER.debug("Closing App because monitor is gone.");
+ logger.debug("Closing App because monitor is gone.");
terminate();
}
}
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 23f2333d19c..246afdf89f3 100644
--- a/sonar-application/src/main/resources/org/sonar/application/logback.xml
+++ b/sonar-application/src/main/resources/org/sonar/application/logback.xml
@@ -1,53 +1,8 @@
<?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="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <File>${sonar.path.logs}/logs/sonar.log</File>
- <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
- <param name="FileNamePattern" value="${sonar.path.logs}/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>
- %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>
-
- <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>
@@ -59,7 +14,6 @@
<root>
<level value="INFO"/>
<appender-ref ref="CONSOLE"/>
- <appender-ref ref="FILE"/>
</root>
</configuration>