Skip to content

11.0.x of PR#1002: Add access-log pattern: %% #1003

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fabian-hahn wants to merge 3 commits into
base: 11.0.x
Choose a base branch
from
+28 −3
Open

11.0.x of PR#1002: Add access-log pattern: %% #1003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9701888
AccessLogValve log-format pattern:
fabian-hahn May 2, 2026
c6f1207
Typo
fabian-hahn May 2, 2026
d1bbb61
Merge branch '11.0.x' into 11.0.x
fabian-hahn May 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion java/org/apache/catalina/valves/AbstractAccessLogValve.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2155,6 +2155,20 @@ protected AccessLogElement createAccessLogElement(String name, char pattern) {
return new RemoteAddrElement(name);
case 'c':
return new CookieElement(name);
case 'D':
if ("ns".equals(name)) {
return new ElapsedTimeElement(ElapsedTimeElement.Style.NANOSECONDS);
} else if ("us".equals(name)) {
return new ElapsedTimeElement(ElapsedTimeElement.Style.MICROSECONDS);
} else if ("ms".equals(name)) {
return new ElapsedTimeElement(ElapsedTimeElement.Style.MILLISECONDS);
} else if ("s".equals(name)) {
return new ElapsedTimeElement(ElapsedTimeElement.Style.SECONDS);
} else if ("fracsec".equals(name)) {
return new ElapsedTimeElement(ElapsedTimeElement.Style.SECONDS_FRACTIONAL);
} else {
return new StringElement("???" + name + "???");
}
case 'i':
return new HeaderElement(name);
case 'L':
Expand All @@ -2180,10 +2194,12 @@ protected AccessLogElement createAccessLogElement(String name, char pattern) {
return new ElapsedTimeElement(ElapsedTimeElement.Style.MICROSECONDS);
} else if ("ms".equals(name)) {
return new ElapsedTimeElement(ElapsedTimeElement.Style.MILLISECONDS);
} else if ("s".equals(name)) {
return new ElapsedTimeElement(ElapsedTimeElement.Style.SECONDS);
} else if ("fracsec".equals(name)) {
return new ElapsedTimeElement(ElapsedTimeElement.Style.SECONDS_FRACTIONAL);
} else {
return new ElapsedTimeElement(ElapsedTimeElement.Style.SECONDS);
return new StringElement("???" + name + "???");
}
default:
return new StringElement("???");
Expand All @@ -2199,6 +2215,8 @@ protected AccessLogElement createAccessLogElement(String name, char pattern) {
*/
protected AccessLogElement createAccessLogElement(char pattern) {
switch (pattern) {
case '%':
return new StringElement("%");
case 'a':
return new RemoteAddrElement();
case 'A':
Expand Down
4 changes: 3 additions & 1 deletion java/org/apache/catalina/valves/ExtendedAccessLogValve.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,10 +518,12 @@ protected AccessLogElement getLogElement(String token, PatternTokenizer tokenize
return new ElapsedTimeElement(ElapsedTimeElement.Style.MICROSECONDS);
} else if ("ms".equals(nextToken)) {
return new ElapsedTimeElement(ElapsedTimeElement.Style.MILLISECONDS);
} else if ("s".equals(nextToken)) {
return new ElapsedTimeElement(ElapsedTimeElement.Style.SECONDS);
} else if ("fracsec".equals(nextToken)) {
return new ElapsedTimeElement(ElapsedTimeElement.Style.SECONDS_FRACTIONAL);
} else {
return new ElapsedTimeElement(ElapsedTimeElement.Style.SECONDS);
return new StringElement("???" + nextToken + "???");
}
} else {
return new ElapsedTimeElement(ElapsedTimeElement.Style.SECONDS);
Expand Down
1 change: 1 addition & 0 deletions test/org/apache/catalina/valves/TestAccessLogValve.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ public class TestAccessLogValve extends TomcatBaseTest {
public static Collection<Object[]> parameters() {
List<Object[]> parameterSets = new ArrayList<>();

parameterSets.add(new Object[] {"pct-pct", TEXT_TYPE, "/", "%%", "%"});
parameterSets.add(new Object[] {"pct-a", TEXT_TYPE, "/", "%a", LOCAL_IP_PATTERN});
parameterSets.add(new Object[] {"pct-a", JSON_TYPE, "/", "%a", "\\{\"remoteAddr\":\"" + LOCAL_IP_PATTERN + "\"\\}"});
parameterSets.add(new Object[] {"pct-A", TEXT_TYPE, "/", "%A", IP_PATTERN});
Expand Down
5 changes: 4 additions & 1 deletion webapps/docs/changelog.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,10 @@
Ensure <code>RealmBase</code> finds all matching extension based
security constraints. (markt)
</fix>
<add>
Add <code>%%</code> in AccessLogValve pattern. Align <code>%{xxx}D</code> modifiers with <code>%{xxx}T</code>.
Pull request <pr>1003</pr> provided by effhaa.
</add>
</changelog>
</subsection>
<subsection name="Coyote">
Expand Down Expand Up @@ -5658,4 +5662,3 @@
</section>
</body>
</document>

1 change: 1 addition & 0 deletions webapps/docs/config/valve.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,7 @@
the current request and response. The following pattern codes are
supported:</p>
<ul>
<li><b><code>%%</code></b> - Literal '%' character</li>
<li><b><code>%a</code></b> - Remote IP address.
See also <code>%{xxx}a</code> below.</li>
<li><b><code>%A</code></b> - Local IP address</li>
Expand Down