From 26d3be6225bb7190686fa9349f5ed32c2ce14bf3 Mon Sep 17 00:00:00 2001 From: Bjørn Meland Date: Tue, 24 May 2022 00:30:31 +0200 Subject: Revert "Disallow 'accesslog' override for applications" --- .../yahoo/vespa/model/container/xml/ContainerModelBuilder.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'config-model/src/main') 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..951317b68f3 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 @@ -432,13 +432,8 @@ public class ContainerModelBuilder extends ConfigModelBuilder { protected void addAccessLogs(DeployState deployState, ApplicationContainerCluster cluster, Element spec) { List accessLogElements = getAccessLogElements(spec); - if (cluster.isHostedVespa() && !accessLogElements.isEmpty()) { - log.logApplicationPackage( - Level.WARNING, "The element 'accesslog' is not overridable in hosted Vespa"); - } else { - for (Element accessLog : accessLogElements) { - AccessLogBuilder.buildIfNotDisabled(deployState, cluster, accessLog).ifPresent(cluster::addComponent); - } + for (Element accessLog : accessLogElements) { + AccessLogBuilder.buildIfNotDisabled(deployState, cluster, accessLog).ifPresent(cluster::addComponent); } if (accessLogElements.isEmpty() && deployState.getAccessLoggingEnabledByDefault()) -- cgit v1.2.3