SONAR-20855 uploading logs on failure on cirrus

diff --git a/.cirrus.yml b/.cirrus.yml
index 9d77c2109526cbd10727d278cbd5b46cd3a92c9f..da2770e0eb212d79adc75c1496e10338d913e58a 100644 (file)
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -147,6 +147,8 @@ default_artifact_template: &DEFAULT_ARTIFACTS_TEMPLATE
       path: "**/build/reports/**/*"
     screenshots_artifacts:
       path: "**/build/screenshots/**/*"
+    log_artifacts:
+      path: "**/build/**/*.log"
   always:
     profile_artifacts:
       path: "**/build/reports/profile/**/*"

diff --git a/server/sonar-webserver/src/main/java/org/sonar/server/app/TomcatAccessLog.java b/server/sonar-webserver/src/main/java/org/sonar/server/app/TomcatAccessLog.java
index 60a9bdf7621e35cd91c84303a54e3c12259a2fc1..1291477c37326eab928f5bc30ac9dac4dfd068e6 100644 (file)
--- a/server/sonar-webserver/src/main/java/org/sonar/server/app/TomcatAccessLog.java
+++ b/server/sonar-webserver/src/main/java/org/sonar/server/app/TomcatAccessLog.java
@@ -33,7 +33,7 @@ class TomcatAccessLog {
 
   private static final String PROPERTY_ENABLE = "sonar.web.accessLogs.enable";
   private static final String PROPERTY_PATTERN = "sonar.web.accessLogs.pattern";
-  private static final String DEFAULT_SQ_ACCESS_LOG_PATTERN = "%h %l %u [%t] \"%r\" %s %b \"%i{Referer}\" \"%i{User-Agent}\" \"%reqAttribute{ID}\"";
+  private static final String DEFAULT_SQ_ACCESS_LOG_PATTERN = "%h %l %u [%t] \"%r\" %s %b \"%i{Referer}\" \"%i{User-Agent}\" \"%reqAttribute{ID}\" %D";
 
   void configure(Tomcat tomcat, Props props) {
     tomcat.setSilent(true);