diff options
| author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2014-09-24 18:19:50 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2014-09-24 18:19:50 +0200 |
| commit | 85c037c87a728edbefc0fd417d6cb89cab246e44 (patch) | |
| tree | e3522ce24ff20fe3d3d0647bee363dd74e28fdf1 /server/sonar-search | |
| parent | 410c98978ca7ee3c667dcbcffe4d3ec085c6e517 (diff) | |
| download | sonarqube-85c037c87a728edbefc0fd417d6cb89cab246e44.tar.gz sonarqube-85c037c87a728edbefc0fd417d6cb89cab246e44.zip | |
SONAR-5621 Merge server log files into a single one
Diffstat (limited to 'server/sonar-search')
| -rw-r--r-- | server/sonar-search/src/main/java/org/sonar/search/SearchServer.java | 2 | ||||
| -rw-r--r-- | server/sonar-search/src/main/resources/org/sonar/search/logback.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java b/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java index cb039b55162..d63abe3b2b5 100644 --- a/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java +++ b/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java @@ -249,7 +249,7 @@ public class SearchServer implements Monitored { @Override public synchronized void stop() { - if (!node.isClosed()) { + if (node != null && !node.isClosed()) { node.close(); } } diff --git a/server/sonar-search/src/main/resources/org/sonar/search/logback.xml b/server/sonar-search/src/main/resources/org/sonar/search/logback.xml index d10553b643b..3c24d95cdc0 100644 --- a/server/sonar-search/src/main/resources/org/sonar/search/logback.xml +++ b/server/sonar-search/src/main/resources/org/sonar/search/logback.xml @@ -12,7 +12,7 @@ <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 [%logger{20}] %X %msg%n + %d{yyyy.MM.dd HH:mm:ss} %-5level sea[%logger{20}] %X %msg%n </pattern> </encoder> </appender> |