Merge pull request #22552 from vespa-engine/bjormel/hosted-connection-log-without-container-name

Hosted: Do not use clusterId as part of filename for ConnectionLog

1 files changed, 7 insertions, 2 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/component/ConnectionLogComponent.java b/config-model/src/main/java/com/yahoo/vespa/model/container/component/ConnectionLogComponent.java
index 07a48e94399..0c65aee798b 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/component/ConnectionLogComponent.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/component/ConnectionLogComponent.java
@@ -10,21 +10,26 @@ public class ConnectionLogComponent extends SimpleComponent implements Connectio
 
     private final String logDirectoryName;
     private final String clusterName;
+    private final boolean isHostedVespa;
 
     public ConnectionLogComponent(ContainerCluster<?> cluster, Class<? extends ConnectionLog> cls, String logDirectoryName) {
-        this(cls, logDirectoryName, cluster.getName());
+        this(cls, logDirectoryName, cluster.getName(), cluster.isHostedVespa());
     }
 
-    public ConnectionLogComponent(Class<? extends ConnectionLog> cls, String logDirectoryName, String clusterName) {
+    public ConnectionLogComponent(Class<? extends ConnectionLog> cls, String logDirectoryName, String clusterName, boolean isHostedVespa) {
         super(cls.getName());
         this.logDirectoryName = logDirectoryName;
         this.clusterName = clusterName;
+        this.isHostedVespa = isHostedVespa;
     }
 
     @Override
     public void getConfig(ConnectionLogConfig.Builder builder) {
         builder.cluster(clusterName);
         builder.logDirectoryName(logDirectoryName);
+        if (isHostedVespa) {
+            builder.useClusterIdInFileName(false);
+        }
         builder.queueSize(-1);
     }
 }