Merge pull request #6033 from eclipse/jetty-10.0.x-6008-RequestLogFix

Issue #6008 - fix RequestLog usage with filePath.
jetty · Mar 11, 2021 · c664d67 · c664d67
2 parents 1df8652 + 671a76c
commit c664d67
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/jetty-server/src/main/config/etc/jetty-requestlog.xml b/jetty-server/src/main/config/etc/jetty-requestlog.xml
@@ -18,7 +18,13 @@
           <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
@@ -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"