summaryrefslogtreecommitdiffstats
path: root/config-model/src/main/java/com
diff options
context:
space:
mode:
authorbjormel <bjormel@verizonmedia.com>2022-05-26 15:34:40 +0200
committerbjormel <bjormel@verizonmedia.com>2022-05-26 15:34:40 +0200
commit7e7048b5c769408aeb06e5ab9bcd0c982526003a (patch)
treedc8d11cf322e01fac5b21b492dfe99bbd78c5a7c /config-model/src/main/java/com
parent5ad3ee45adbc357e41c9779f19a28c05c94b0239 (diff)
Clear accessLogElements if set in hosted vespa
Diffstat (limited to 'config-model/src/main/java/com')
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
index abbd9644901..dd0d74aa1e8 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
@@ -433,8 +433,9 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
List<Element> accessLogElements = getAccessLogElements(spec);
if (cluster.isHostedVespa() && !accessLogElements.isEmpty()) {
+ accessLogElements.clear();
log.logApplicationPackage(
- Level.WARNING, "The element 'accesslog' is not overridable in hosted Vespa");
+ Level.WARNING, "Applications are not allowed to override the 'accesslog' element");
} else {
for (Element accessLog : accessLogElements) {
AccessLogBuilder.buildIfNotDisabled(deployState, cluster, accessLog).ifPresent(cluster::addComponent);