aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@vespa.ai>2024-06-05 09:20:21 +0200
committerBjørn Christian Seime <bjorncs@vespa.ai>2024-06-05 09:20:21 +0200
commit44e9f4e2abc2bb54f5d1261794a2bb585abdd81c (patch)
treef9d952a8834b258b5e01fd6625ed532289f8d176
parent24eaf25b84dee5db85aba118dc0dbb5c9327a684 (diff)
Fix regex
-rw-r--r--container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/AccessLoggingRequestHandler.java2
-rw-r--r--container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/AccessLoggingRequestHandler.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/AccessLoggingRequestHandler.java
index dbf9138275b..9d9edb7f38c 100644
--- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/AccessLoggingRequestHandler.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/AccessLoggingRequestHandler.java
@@ -68,7 +68,7 @@ public class AccessLoggingRequestHandler extends AbstractRequestHandler implemen
: Pattern.compile(
contentPathPrefixes.stream()
.map(Pattern::quote)
- .collect(Collectors.joining("|", "^(", ")")))
+ .collect(Collectors.joining("|", "^(", ").*$")))
.asMatchPredicate();
}
diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java
index ef1576b1ae8..e95d71eb4ec 100644
--- a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java
@@ -745,7 +745,7 @@ public class HttpServerTest {
new ServerConfig.Builder(),
new ConnectorConfig.Builder().accessLog(
new ConnectorConfig.AccessLog.Builder()
- .contentPathPrefixes("/status.html")),
+ .contentPathPrefixes("/status")),
binder -> binder.bind(RequestLog.class).toInstance(requestLogMock));
driver.client().newPost("/status.html").setContent("abcdef").execute().expectStatusCode(is(OK));
RequestLogEntry entry = requestLogMock.poll(Duration.ofSeconds(5));