From c1215e46c2149334d403358e11ddb69414e8f92e Mon Sep 17 00:00:00 2001
From: Lachlan Roberts <lachlan@webtide.com>
Date: Tue, 9 Mar 2021 18:35:34 +1100
Subject: [PATCH] Issue #6008 - changes from review

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

diff --git a/jetty-server/src/main/config/etc/jetty-requestlog.xml b/jetty-server/src/main/config/etc/jetty-requestlog.xml
index f013f552cf63..1b3a7a070117 100644
--- a/jetty-server/src/main/config/etc/jetty-requestlog.xml
+++ b/jetty-server/src/main/config/etc/jetty-requestlog.xml
@@ -20,7 +20,9 @@
               <Arg><Property name="jetty.base"/></Arg>
               <Arg>
                 <Property name="jetty.requestlog.filePath">
-                  <Default><Property name="jetty.requestlog.dir" default="logs"/>/yyyy_mm_dd.request.log</Default>
+                  <Default>
+                    <Property name="jetty.requestlog.dir" default="logs"/>/yyyy_mm_dd.request.log
+                  </Default>
                 </Property>
               </Arg>
             </Call>
diff --git a/jetty-server/src/main/config/modules/requestlog.mod b/jetty-server/src/main/config/modules/requestlog.mod
index 1e78094265c8..e4a660b3f3c4 100644
--- a/jetty-server/src/main/config/modules/requestlog.mod
+++ b/jetty-server/src/main/config/modules/requestlog.mod
@@ -16,9 +16,6 @@ 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"