diff options
author | Harald Musum <musum@yahooinc.com> | 2023-04-29 11:48:33 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-29 11:48:33 +0200 |
commit | f575fcdb389d483e33011ad9edb7cba5bcf1f52e (patch) | |
tree | 96289e487e20e5475fa6afed1c8dcbc89936a0c3 /config-model/src/main/java/com/yahoo/vespa/model/admin | |
parent | 592c38d1b1f85ebc2150354f23f3b64ca3be2159 (diff) |
Revert "Revert "Reapply "Remove access logging for container clusters that are internal"""
Diffstat (limited to 'config-model/src/main/java/com/yahoo/vespa/model/admin')
3 files changed, 6 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/LogserverContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/LogserverContainerCluster.java index fef7d534c30..31eb3a7bcc2 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/LogserverContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/LogserverContainerCluster.java @@ -4,6 +4,8 @@ package com.yahoo.vespa.model.admin; import com.yahoo.config.model.deploy.DeployState; import com.yahoo.config.model.producer.TreeConfigProducer; import com.yahoo.config.provision.ClusterSpec; +import com.yahoo.container.logging.AccessLog; +import com.yahoo.jdisc.http.server.jetty.VoidRequestLog; import com.yahoo.search.config.QrStartConfig; import com.yahoo.vespa.model.container.ContainerCluster; import com.yahoo.vespa.model.container.component.Handler; @@ -21,6 +23,7 @@ public class LogserverContainerCluster extends ContainerCluster<LogserverContain addDefaultHandlersWithVip(); addLogHandler(); + addAccessLog(); setJvmGCOptions(deployState.getProperties().jvmGCOptions(Optional.of(ClusterSpec.Type.admin))); } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainerCluster.java index c65abfb0189..15e3c113d16 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainerCluster.java @@ -5,6 +5,7 @@ import com.yahoo.config.model.api.Reindexing; import com.yahoo.config.model.deploy.DeployState; import com.yahoo.config.model.producer.TreeConfigProducer; import com.yahoo.config.provision.ClusterSpec; +import com.yahoo.jdisc.http.server.jetty.VoidRequestLog; import com.yahoo.search.config.QrStartConfig; import com.yahoo.vespa.model.container.ContainerCluster; import com.yahoo.vespa.model.container.PlatformBundles; @@ -30,6 +31,7 @@ public class ClusterControllerContainerCluster extends ContainerCluster<ClusterC TreeConfigProducer<?> parent, String subId, String name, DeployState deployState) { super(parent, subId, name, deployState, false); addDefaultHandlersWithVip(); + addAccessLog(); this.reindexingContext = createReindexingContext(deployState); setJvmGCOptions(deployState.getProperties().jvmGCOptions(Optional.of(ClusterSpec.Type.admin))); } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java index ada647b535d..aedd27334e3 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java @@ -86,12 +86,10 @@ public class MetricsProxyContainerCluster extends ContainerCluster<MetricsProxyC static final String LEGACY_APPLICATION = "app"; // app.instance } - private final TreeConfigProducer<?> parent; private final ApplicationId applicationId; public MetricsProxyContainerCluster(TreeConfigProducer<?> parent, String name, DeployState deployState) { super(parent, name, name, deployState, true); - this.parent = parent; applicationId = deployState.getProperties().applicationId(); setRpcServerEnabled(true); @@ -99,6 +97,7 @@ public class MetricsProxyContainerCluster extends ContainerCluster<MetricsProxyC addPlatformBundle(METRICS_PROXY_BUNDLE_FILE); addClusterComponents(); + addAccessLog(); } @Override |