From 5abfb3b646244299f09bdcfc9e9f13d756334846 Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Tue, 30 Jan 2018 12:58:35 +0100 Subject: Add rawPath and rawQuery to AccessLogEntry --- .../java/com/yahoo/container/jdisc/LoggingRequestHandler.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'container-core/src/main/java/com/yahoo/container/jdisc') diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/LoggingRequestHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/LoggingRequestHandler.java index fe11bd42a01..698c9d7f902 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/LoggingRequestHandler.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/LoggingRequestHandler.java @@ -20,6 +20,7 @@ import java.io.IOException; import java.io.OutputStream; import java.net.InetSocketAddress; import java.net.SocketAddress; +import java.net.URI; import java.util.Optional; import java.util.concurrent.Executor; import java.util.concurrent.atomic.AtomicBoolean; @@ -304,7 +305,10 @@ public abstract class LoggingRequestHandler extends ThreadedHttpRequestHandler { logEntry.setRemoteAddress(remoteAddress); logEntry.setRemotePort(remoteAddress.getPort()); } - logEntry.setURI(AccessLogUtil.getUri(httpRequest)); + URI uri = AccessLogUtil.getUri(httpRequest); + setDeprecatedUri(logEntry, uri); + logEntry.setRawPath(uri.getRawPath()); + logEntry.setRawQuery(uri.getRawQuery()); logEntry.setUserAgent(AccessLogUtil.getUserAgentHeader(httpRequest)); logEntry.setReferer(AccessLogUtil.getReferrerHeader(httpRequest)); logEntry.setHttpMethod(AccessLogUtil.getHttpMethod(httpRequest)); @@ -314,6 +318,11 @@ public abstract class LoggingRequestHandler extends ThreadedHttpRequestHandler { } } + @SuppressWarnings("deprecation") + private static void setDeprecatedUri(AccessLogEntry logEntry, URI uri) { + logEntry.setURI(uri); + } + @Override public void handleTimeout(Request request, ResponseHandler responseHandler) { LoggingHandler loggingHandler = this.loggingHandler.get(); -- cgit v1.2.3