Clear accessLogElements if set in hosted vespa

2 files changed, 3 insertions, 2 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);
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
index 7c76aef0981..81649375c8a 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
@@ -1124,7 +1124,7 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase {
         createModel(root, deployState, null, DomBuilderTest.parse(containerService));
         assertFalse(logger.msgs.isEmpty());
         assertEquals(Level.WARNING, logger.msgs.get(0).getFirst());
-        assertEquals("The element 'accesslog' is not overridable in hosted Vespa",
+        assertEquals("Applications are not allowed to override the 'accesslog' element",
                 logger.msgs.get(0).getSecond());
     }