diff options
| author | Bjørn Meland <bjormel@users.noreply.github.com> | 2022-05-24 00:30:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-24 00:30:15 +0200 |
| commit | fcf7f911fca5729d9cb7f67a5f8fa786ad77dfc2 (patch) | |
| tree | 0f462959e0e71d2f9d1d14296c9ba8262a0ca59a | |
| parent | 42fc95b406a0dd8b7843155c9892ef5455733ff8 (diff) | |
| parent | fafb3be59209245dd4b9fa3d9a58b05e0f92b29a (diff) | |
Merge pull request #22726 from vespa-engine/revert-22553-bjormel/applications-are-not-allowed-to-override-the-accesslog-element
Revert "Applications are not allowed to override the 'accesslog' element"
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 1121a90693b..abbd9644901 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 @@ -434,7 +434,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { if (cluster.isHostedVespa() && !accessLogElements.isEmpty()) { log.logApplicationPackage( - Level.WARNING, "Applications are not allowed to override the 'accesslog' element"); + Level.WARNING, "The element 'accesslog' is not overridable in hosted Vespa"); } 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 81649375c8a..7c76aef0981 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("Applications are not allowed to override the 'accesslog' element", + assertEquals("The element 'accesslog' is not overridable in hosted Vespa", logger.msgs.get(0).getSecond()); } |