diff options
| author | Frode Lundgren <frodelu@yahooinc.com> | 2022-05-11 20:42:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-11 20:42:00 +0200 |
| commit | f055594f402631c216241a123144bbe171c61e4b (patch) | |
| tree | 1442a576ad39d2565f9dde4e2532e2082e8c375f /config-model | |
| parent | f888300cc37a26dbbce46d3dc75d7ca45b6629fe (diff) | |
| parent | 269d00f457ffdef97e77fd1e7ab3dc786fa4c966 (diff) | |
Merge pull request #22553 from vespa-engine/bjormel/applications-are-not-allowed-to-override-the-accesslog-element
Applications are not allowed to override the 'accesslog' element
Diffstat (limited to 'config-model')
2 files changed, 2 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 ee974d800c6..18399e67ba2 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 @@ -424,7 +424,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { if (cluster.isHostedVespa() && !accessLogElements.isEmpty()) { 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()); } |