diff options
| author | Frode Lundgren <frodelu@yahooinc.com> | 2022-05-24 00:33:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-24 00:33:56 +0200 |
| commit | 30ae0b5e47a871c3757cd2ae10f2f9bb52024556 (patch) | |
| tree | ed23bbb831c35124fe012cc23495b14572d3bcc6 /config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java | |
| parent | fcf7f911fca5729d9cb7f67a5f8fa786ad77dfc2 (diff) | |
| parent | 26d3be6225bb7190686fa9349f5ed32c2ce14bf3 (diff) | |
Merge pull request #22727 from vespa-engine/revert-22541-bjormel/disallow-accesslog-override-hostedv7.589.25
Revert "Disallow 'accesslog' override for applications"
Diffstat (limited to 'config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java | 9 |
1 files changed, 2 insertions, 7 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..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<ContainerModel> { protected void addAccessLogs(DeployState deployState, ApplicationContainerCluster cluster, Element spec) { List<Element> 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()) |