This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 5d3b5c9 [65022] Change tomcat access log attributes to be shown as
code. (#397)
5d3b5c9 is described below
commit 5d3b5c90708a71665692548b6f7f6c8faf15edb6
Author: Abhishek Sah <abhisheksha...@gmail.com>
AuthorDate: Mon Dec 28 14:54:38 2020 +0530
[65022] Change tomcat access log attributes to be shown as code. (#397)
(cherry picked from commit 6593fa7b23a67ae5396c76a7893c45b4e5616135)
(cherry picked from commit a8ff4d2cacfca315db45a9f35864e79f667fdbb5)
---
.../catalina/valves/AbstractAccessLogValve.java | 44 ++++++++--------
webapps/docs/config/valve.xml | 60 +++++++++++-----------
2 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/java/org/apache/catalina/valves/AbstractAccessLogValve.java
b/java/org/apache/catalina/valves/AbstractAccessLogValve.java
index 10c0798..18ede7d 100644
--- a/java/org/apache/catalina/valves/AbstractAccessLogValve.java
+++ b/java/org/apache/catalina/valves/AbstractAccessLogValve.java
@@ -67,31 +67,31 @@ import org.apache.tomcat.util.net.IPv6Utils;
* following replacement strings, for which the corresponding information
* from the specified Response is substituted:</p>
* <ul>
- * <li><b>%a</b> - Remote IP address
- * <li><b>%A</b> - Local IP address
- * <li><b>%b</b> - Bytes sent, excluding HTTP headers, or '-' if no bytes
+ * <li><b><code>%a</code></b> - Remote IP address
+ * <li><b><code>%A</code></b> - Local IP address
+ * <li><b><code>%b</code></b> - Bytes sent, excluding HTTP headers, or '-' if
no bytes
* were sent
- * <li><b>%B</b> - Bytes sent, excluding HTTP headers
- * <li><b>%h</b> - Remote host name (or IP address if
+ * <li><b><code>%B</code></b> - Bytes sent, excluding HTTP headers
+ * <li><b><code>%h</code></b> - Remote host name (or IP address if
* <code>enableLookups</code> for the connector is false)
- * <li><b>%H</b> - Request protocol
- * <li><b>%l</b> - Remote logical username from identd (always returns '-')
- * <li><b>%m</b> - Request method
- * <li><b>%p</b> - Local port
- * <li><b>%q</b> - Query string (prepended with a '?' if it exists, otherwise
+ * <li><b><code>%H</code></b> - Request protocol
+ * <li><b><code>%l</code></b> - Remote logical username from identd (always
returns '-')
+ * <li><b><code>%m</code></b> - Request method
+ * <li><b><code>%p</code></b> - Local port
+ * <li><b><code>%q</code></b> - Query string (prepended with a '?' if it
exists, otherwise
* an empty string
- * <li><b>%r</b> - First line of the request
- * <li><b>%s</b> - HTTP status code of the response
- * <li><b>%S</b> - User session ID
- * <li><b>%t</b> - Date and time, in Common Log Format format
- * <li><b>%u</b> - Remote user that was authenticated
- * <li><b>%U</b> - Requested URL path
- * <li><b>%v</b> - Local server name
- * <li><b>%D</b> - Time taken to process the request, in millis
- * <li><b>%T</b> - Time taken to process the request, in seconds
- * <li><b>%F</b> - Time taken to commit the response, in millis
- * <li><b>%I</b> - current Request thread name (can compare later with
stacktraces)
- * <li><b>%X</b> - Connection status when response is completed:
+ * <li><b><code>%r</code></b> - First line of the request
+ * <li><b><code>%s</code></b> - HTTP status code of the response
+ * <li><b><code>%S</code></b> - User session ID
+ * <li><b><code>%t</code></b> - Date and time, in Common Log Format format
+ * <li><b><code>%u</code></b> - Remote user that was authenticated
+ * <li><b><code>%U</code></b> - Requested URL path
+ * <li><b><code>%v</code></b> - Local server name
+ * <li><b><code>%D</code></b> - Time taken to process the request, in millis
+ * <li><b><code>%T</code></b> - Time taken to process the request, in seconds
+ * <li><b><code>%F</code></b> - Time taken to commit the response, in millis
+ * <li><b><code>%I</code></b> - current Request thread name (can compare later
with stacktraces)
+ * <li><b><code>%X</code></b> - Connection status when response is completed:
* <ul>
* <li><code>X</code> = Connection aborted before the response
completed.</li>
* <li><code>+</code> = Connection may be kept alive after the response is
sent.</li>
diff --git a/webapps/docs/config/valve.xml b/webapps/docs/config/valve.xml
index 4c04caf..98793a2 100644
--- a/webapps/docs/config/valve.xml
+++ b/webapps/docs/config/valve.xml
@@ -284,41 +284,41 @@
the current request and response. The following pattern codes are
supported:</p>
<ul>
- <li><b>%a</b> - Remote IP address.
+ <li><b><code>%a</code></b> - Remote IP address.
See also <code>%{xxx}a</code> below.</li>
- <li><b>%A</b> - Local IP address</li>
- <li><b>%b</b> - Bytes sent, excluding HTTP headers, or '-' if zero</li>
- <li><b>%B</b> - Bytes sent, excluding HTTP headers</li>
- <li><b>%h</b> - Remote host name (or IP address if
+ <li><b><code>%A</code></b> - Local IP address</li>
+ <li><b><code>%b</code></b> - Bytes sent, excluding HTTP headers, or '-' if
zero</li>
+ <li><b><code>%B</code></b> - Bytes sent, excluding HTTP headers</li>
+ <li><b><code>%h</code></b> - Remote host name (or IP address if
<code>enableLookups</code> for the connector is false)</li>
- <li><b>%H</b> - Request protocol</li>
- <li><b>%l</b> - Remote logical username from identd (always returns
+ <li><b><code>%H</code></b> - Request protocol</li>
+ <li><b><code>%l</code></b> - Remote logical username from identd (always
returns
'-')</li>
- <li><b>%m</b> - Request method (GET, POST, etc.)</li>
- <li><b>%p</b> - Local port on which this request was received.
+ <li><b><code>%m</code></b> - Request method (GET, POST, etc.)</li>
+ <li><b><code>%p</code></b> - Local port on which this request was received.
See also <code>%{xxx}p</code> below.</li>
- <li><b>%q</b> - Query string (prepended with a '?' if it exists)</li>
- <li><b>%r</b> - First line of the request (method and request URI)</li>
- <li><b>%s</b> - HTTP status code of the response</li>
- <li><b>%S</b> - User session ID</li>
- <li><b>%t</b> - Date and time, in Common Log Format</li>
- <li><b>%u</b> - Remote user that was authenticated (if any), else '-'
(escaped if required)</li>
- <li><b>%U</b> - Requested URL path</li>
- <li><b>%v</b> - Local server name</li>
- <li><b>%D</b> - Time taken to process the request in millis. Note: In
- httpd %D is microseconds. Behaviour will be aligned to
httpd
- in Tomcat 10 onwards.</li>
- <li><b>%T</b> - Time taken to process the request, in seconds. Note: This
- value has millisecond resolution whereas in httpd it has
- second resolution. Behaviour will be align to httpd
- in Tomcat 10 onwards.</li>
- <li><b>%F</b> - Time taken to commit the response, in millis</li>
- <li><b>%I</b> - Current request thread name (can compare later with
stacktraces)</li>
- <li><b>%X</b> - Connection status when response is completed:
+ <li><b><code>%q</code></b> - Query string (prepended with a '?' if it
exists)</li>
+ <li><b><code>%r</code></b> - First line of the request (method and request
URI)</li>
+ <li><b><code>%s</code></b> - HTTP status code of the response</li>
+ <li><b><code>%S</code></b> - User session ID</li>
+ <li><b><code>%t</code></b> - Date and time, in Common Log Format</li>
+ <li><b><code>%u</code></b> - Remote user that was authenticated (if any),
else '-' (escaped if required)</li>
+ <li><b><code>%U</code></b> - Requested URL path</li>
+ <li><b><code>%v</code></b> - Local server name</li>
+ <li><b><code>%D</code></b> - Time taken to process the request in millis.
Note: In
+ httpd %D is microseconds. Behaviour will be aligned to httpd
+ in Tomcat 10 onwards.</li>
+ <li><b><code>%T</code></b> - Time taken to process the request, in
seconds. Note: This
+ value has millisecond resolution whereas in httpd it has
+ second resolution. Behaviour will be align to httpd
+ in Tomcat 10 onwards.</li>
+ <li><b><code>%F</code></b> - Time taken to commit the response, in
milliseconds</li>
+ <li><b><code>%I</code></b> - Current request thread name (can compare
later with stacktraces)</li>
+ <li><b><code>%X</code></b> - Connection status when response is completed:
<ul>
- <li><code>X</code> = Connection aborted before the response
completed.</li>
- <li><code>+</code> = Connection may be kept alive after the response is
sent.</li>
- <li><code>-</code> = Connection will be closed after the response is
sent.</li>
+ <li><code>X</code> = Connection aborted before the response
completed.</li>
+ <li><code>+</code> = Connection may be kept alive after the response
is sent.</li>
+ <li><code>-</code> = Connection will be closed after the response is
sent.</li>
</ul>
</li>
</ul>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
