diff options
| author | Harald Musum <musum@verizonmedia.com> | 2023-04-28 16:24:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-28 16:24:44 +0200 |
| commit | 9dd0d84b1714e5e1544462ff3a2b02c42f98d847 (patch) | |
| tree | 2cedd489d44f0b2dd1937e82d2b926b73f93a374 | |
| parent | a0eae946b01b3935496ef520886ffbff1d7dffc2 (diff) | |
| parent | d4e31221e45bc12c889772b9e78ed7bf1ba469e4 (diff) | |
Merge pull request #26904 from vespa-engine/hmusum/simplify-connection-log-setup
Simplify connection log setup
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java | 10 |
1 files changed, 2 insertions, 8 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 e81d3fe77e7..e5ed72ad8f9 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 @@ -437,14 +437,8 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { } // Add connection log if access log is configured - if (cluster.getAllComponents().stream().anyMatch(component -> component instanceof AccessLogComponent)) { - // TODO: Vespa > 8: Clean up - if (cluster.isHostedVespa() || deployState.getVespaVersion().getMajor() == 8) { - cluster.addComponent(new ConnectionLogComponent(cluster, FileConnectionLog.class, "access")); - } else { - cluster.addComponent(new ConnectionLogComponent(cluster, FileConnectionLog.class, "qrs")); - } - } + if (cluster.getAllComponents().stream().anyMatch(component -> component instanceof AccessLogComponent)) + cluster.addComponent(new ConnectionLogComponent(cluster, FileConnectionLog.class, "access")); } private List<Element> getAccessLogElements(Element spec) { |