From 08c4ce14abebb393c3d85dd2513c25277bc714c0 Mon Sep 17 00:00:00 2001
From: Lachlan Roberts <lachlan@webtide.com>
Date: Thu, 4 Mar 2021 11:19:14 +1100
Subject: [PATCH] Issue #6008 - fix RequestLog usage with filePath.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
---
 jetty-server/src/main/config/etc/jetty-requestlog.xml | 6 +++++-
 jetty-server/src/main/config/modules/requestlog.mod   | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/jetty-server/src/main/config/etc/jetty-requestlog.xml b/jetty-server/src/main/config/etc/jetty-requestlog.xml
index 58a201e96ba7..f013f552cf63 100644
--- a/jetty-server/src/main/config/etc/jetty-requestlog.xml
+++ b/jetty-server/src/main/config/etc/jetty-requestlog.xml
@@ -18,7 +18,11 @@
           <Arg>
             <Call name="resolvePath" class="org.eclipse.jetty.xml.XmlConfiguration">
               <Arg><Property name="jetty.base"/></Arg>
-              <Arg><Property name="jetty.requestlog.dir" default="logs" />/yyyy_mm_dd.request.log</Arg>
+              <Arg>
+                <Property name="jetty.requestlog.filePath">
+                  <Default><Property name="jetty.requestlog.dir" default="logs"/>/yyyy_mm_dd.request.log</Default>
+                </Property>
+              </Arg>
             </Call>
           </Arg>
 
diff --git a/jetty-server/src/main/config/modules/requestlog.mod b/jetty-server/src/main/config/modules/requestlog.mod
index e4a660b3f3c4..1e78094265c8 100644
--- a/jetty-server/src/main/config/modules/requestlog.mod
+++ b/jetty-server/src/main/config/modules/requestlog.mod
@@ -16,6 +16,9 @@ etc/jetty-requestlog.xml
 [files]
 logs/
 
+[ini]
+jetty.requestlog.dir?=logs
+
 [ini-template]
 ## Format string
 # jetty.requestlog.formatString=%a - %u %{dd/MMM/yyyy:HH:mm:ss ZZZ|GMT}t "%r" %s %B "%{Referer}i" "%{User-Agent}i" "%C"