Issue #6008 - Allow absolute paths to be provided in start.ini for re…

…quest log directory. Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
jetty · Feb 25, 2021 · 0533d3b · 0533d3b
1 parent 2001f9f
commit 0533d3b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 12 deletions.
diff --git a/jetty-server/src/main/config/etc/jetty-requestlog.xml b/jetty-server/src/main/config/etc/jetty-requestlog.xml
@@ -15,11 +15,15 @@
       <!-- Writer -->
       <Arg>
         <New class="org.eclipse.jetty.server.AsyncRequestLogWriter">
-          <Arg><Property name="jetty.base" default="." />/<Property>
-              <Name>jetty.requestlog.filePath</Name>
-              <Default><Property name="jetty.requestlog.dir" default="logs"/>/yyyy_mm_dd.request.log</Default>
-            </Property></Arg>
-          <Arg/>
+          <Arg>
+            <Property name="jetty.requestlog.absoluteFilePath">
+              <Default>
+                <Property name="jetty.base" default="." />/<Property name="jetty.requestlog.filePath">
+                  <Default><Property name="jetty.requestlog.dir" default="logs"/>/yyyy_mm_dd.request.log</Default>
+                </Property>
+              </Default>
+            </Property>
+          </Arg>
 
           <Set name="filenameDateFormat"><Property name="jetty.requestlog.filenameDateFormat" default="yyyy_MM_dd"/></Set>
           <Set name="retainDays"><Property name="jetty.requestlog.retainDays" default="90"/></Set>

diff --git a/jetty-server/src/main/config/modules/requestlog.mod b/jetty-server/src/main/config/modules/requestlog.mod
@@ -17,23 +17,26 @@ etc/jetty-requestlog.xml
 logs/
 
 [ini-template]
-## Format string
+## The CustomRequestLog format string (extended NCSA format by default).
 # jetty.requestlog.formatString=%a - %u %{dd/MMM/yyyy:HH:mm:ss ZZZ|GMT}t "%r" %s %B "%{Referer}i" "%{User-Agent}i" "%C"
 
-## Logging directory (relative to $jetty.base)
+## Logging Directory with Relative Path (relative to $jetty.base).
 # jetty.requestlog.dir=logs
 
-## File path
+## Relative File Path (relative to $jetty.base).
 # jetty.requestlog.filePath=${jetty.requestlog.dir}/yyyy_mm_dd.request.log
 
-## Date format for rollovered files (uses SimpleDateFormat syntax)
+## Absolute File Path (will override the relative file path).
+# jetty.requestlog.absoluteFilePath=${jetty.base}/${jetty.requestlog.filePath}
+
+## Date format for rollovered files (uses SimpleDateFormat syntax).
 # jetty.requestlog.filenameDateFormat=yyyy_MM_dd
 
-## How many days to retain old log files
+## The number of days to retain old log files.
 # jetty.requestlog.retainDays=90
 
-## Whether to append to existing file
+## Whether to append to existing file.
 # jetty.requestlog.append=false
 
-## Timezone of the log file rollover
+## Timezone of the log file rollover.
 # jetty.requestlog.timezone=GMT