From 8f706d3cafcb4e676a5a5d682e3ed78518a8a387 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Thu, 17 Nov 2016 15:57:24 +0100 Subject: [PATCH] SONAR-8332 change default access log pattern to include SQ's HTTP request ID --- .../main/java/org/sonar/server/app/TomcatAccessLog.java | 7 ++++--- sonar-application/src/main/assembly/conf/sonar.properties | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/server/sonar-server/src/main/java/org/sonar/server/app/TomcatAccessLog.java b/server/sonar-server/src/main/java/org/sonar/server/app/TomcatAccessLog.java index 54e893240bd..18792c1676f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/app/TomcatAccessLog.java +++ b/server/sonar-server/src/main/java/org/sonar/server/app/TomcatAccessLog.java @@ -31,8 +31,9 @@ import org.sonar.process.Props; class TomcatAccessLog { - public static final String PROPERTY_ENABLE = "sonar.web.accessLogs.enable"; - public static final String PROPERTY_PATTERN = "sonar.web.accessLogs.pattern"; + 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}\""; void configure(Tomcat tomcat, Props props) { tomcat.setSilent(true); @@ -48,7 +49,7 @@ class TomcatAccessLog { FileAppender appender = policy.createAppender("ACCESS_LOG"); PatternLayoutEncoder fileEncoder = new PatternLayoutEncoder(); fileEncoder.setContext(valve); - fileEncoder.setPattern(props.value(PROPERTY_PATTERN, "combined")); + fileEncoder.setPattern(props.value(PROPERTY_PATTERN, DEFAULT_SQ_ACCESS_LOG_PATTERN)); fileEncoder.start(); appender.setEncoder(fileEncoder); appender.start(); diff --git a/sonar-application/src/main/assembly/conf/sonar.properties b/sonar-application/src/main/assembly/conf/sonar.properties index a1f0194ba0e..27b487638c8 100644 --- a/sonar-application/src/main/assembly/conf/sonar.properties +++ b/sonar-application/src/main/assembly/conf/sonar.properties @@ -289,9 +289,9 @@ # The value displayed for anonymous users is "-". # The SonarQube's HTTP request ID can be added to the pattern with "%reqAttribute{ID}" (since version 6.2). # If SonarQube is behind a reverse proxy, then the following value allows to display the correct remote IP address: -#sonar.web.accessLogs.pattern=%i{X-Forwarded-For} %l %u [%t] "%r" %s %b "%i{Referer}" "%i{User-Agent}" -# Default value is: -#sonar.web.accessLogs.pattern=combined +#sonar.web.accessLogs.pattern=%i{X-Forwarded-For} %l %u [%t] "%r" %s %b "%i{Referer}" "%i{User-Agent}" "%reqAttribute{ID}" +# Default value (which was "combined" before version 6.2) is equivalent to "combined + SQ HTTP request ID": +#sonar.web.accessLogs.pattern=%h %l %u [%t] "%r" %s %b "%i{Referer}" "%i{User-Agent}" "%reqAttribute{ID}" #-------------------------------------------------------------------------------------------------- # AUTHENTICATION -- 2.39.5