Override directory name for connection logs in configserver/controller

3 files changed, 9 insertions, 6 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 9977e955f85..8eff7bf7201 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
@@ -11,15 +11,17 @@ import java.util.OptionalInt;
 
 public class ConnectionLogComponent extends SimpleComponent implements ConnectionLogConfig.Producer {
 
+    private final String logDirectoryName;
     private final String clusterName;
     private final int queueSize;
 
-    public ConnectionLogComponent(ContainerCluster<?> cluster, Class<? extends ConnectionLog> cls) {
-        this(cluster, cls, cluster.getName());
+    public ConnectionLogComponent(ContainerCluster<?> cluster, Class<? extends ConnectionLog> cls, String logDirectoryName) {
+        this(cluster, cls, logDirectoryName, cluster.getName());
     }
 
-    public ConnectionLogComponent(ContainerCluster<?> cluster, Class<? extends ConnectionLog> cls, String clusterName) {
+    public ConnectionLogComponent(ContainerCluster<?> cluster, Class<? extends ConnectionLog> cls, String logDirectoryName, String clusterName) {
         super(new ComponentModel(cls.getName(), null, "jdisc_http_service", null));
+        this.logDirectoryName = logDirectoryName;
         this.clusterName = clusterName;
         this.queueSize = queueSize(cluster).orElse(-1);
     }
@@ -34,6 +36,7 @@ public class ConnectionLogComponent extends SimpleComponent implements Connectio
     @Override
     public void getConfig(ConnectionLogConfig.Builder builder) {
         builder.cluster(clusterName);
+        builder.logDirectoryName(logDirectoryName);
         if (queueSize >= 0) {
             builder.queueSize(queueSize);
         }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ConfigServerContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ConfigServerContainerModelBuilder.java
index 0c5375edf71..445da92287b 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ConfigServerContainerModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ConfigServerContainerModelBuilder.java
@@ -49,7 +49,7 @@ public class ConfigServerContainerModelBuilder extends ContainerModelBuilder {
                     new AccessLogComponent(
                             cluster, AccessLogComponent.AccessLogType.jsonAccessLog, AccessLogComponent.CompressionType.ZSTD,
                             "logs/vespa/configserver/access-json.log.%Y%m%d%H%M%S", null, true, true, "access-json.log"));
-            cluster.addComponent(new ConnectionLogComponent(cluster, FileConnectionLog.class));
+            cluster.addComponent(new ConnectionLogComponent(cluster, FileConnectionLog.class, "configserver"));
         } else {
             super.addAccessLogs(deployState, cluster, spec);
         }
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 8735b76100d..66eb26df24f 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
@@ -350,9 +350,9 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
 
         // Add connection log if access log is configured
         if (cluster.getAllComponents().stream().anyMatch(component -> component instanceof AccessLogComponent)) {
-            cluster.addComponent(new ConnectionLogComponent(cluster, FileConnectionLog.class));
+            cluster.addComponent(new ConnectionLogComponent(cluster, FileConnectionLog.class, "qrs"));
         } else {
-            cluster.addComponent(new ConnectionLogComponent(cluster, VoidConnectionLog.class));
+            cluster.addComponent(new ConnectionLogComponent(cluster, VoidConnectionLog.class, "qrs"));
         }
     }