Simplify setup of default handlers.

3 files changed, 11 insertions, 12 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/LogserverContainer.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/LogserverContainer.java
index 32e45a15e31..943d353593d 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/LogserverContainer.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/LogserverContainer.java
@@ -17,13 +17,6 @@ public class LogserverContainer extends Container {
 
     public LogserverContainer(AbstractConfigProducer parent, boolean useSeparateServiceTypeForLogserverContainer) {
         super(parent, "" + 0, 0, true);
-        // Add base handlers and the log handler
-        ContainerCluster logServerCluster = (ContainerCluster) parent;
-        logServerCluster.addMetricStateHandler();
-        logServerCluster.addApplicationStatusHandler();
-        logServerCluster.addDefaultRootHandler();
-        logServerCluster.addVipHandler();
-        addLogHandler(logServerCluster);
         this.useSeparateServiceTypeForLogserverContainer = useSeparateServiceTypeForLogserverContainer;
     }
 
@@ -32,10 +25,5 @@ public class LogserverContainer extends Container {
         return useSeparateServiceTypeForLogserverContainer ? ContainerServiceType.LOGSERVER_CONTAINER : ContainerServiceType.CONTAINER;
     }
 
-    private void addLogHandler(ContainerCluster cluster) {
-        Handler<?> logHandler = Handler.fromClassName(ContainerCluster.LOG_HANDLER_CLASS);
-        logHandler.addServerBindings("http://*/logs", "https://*/logs");
-        cluster.addComponent(logHandler);
-    }
 
 }
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 2dd852e5d97..45deb97cb44 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,7 @@ package com.yahoo.vespa.model.admin;
 import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.config.model.producer.AbstractConfigProducer;
 import com.yahoo.vespa.model.container.ContainerCluster;
+import com.yahoo.vespa.model.container.component.Handler;
 
 /**
  * @author gjoranv
@@ -12,9 +13,18 @@ public class LogserverContainerCluster extends ContainerCluster<LogserverContain
 
     public LogserverContainerCluster(AbstractConfigProducer<?> parent, String subId, String name, DeployState deployState) {
         super(parent, subId, name, deployState);
+
+        addDefaultHandlersWithVip();
+        addLogHandler();
     }
 
     @Override
     protected void myPrepare(DeployState deployState) { }
 
+    private void addLogHandler() {
+        Handler<?> logHandler = Handler.fromClassName(ContainerCluster.LOG_HANDLER_CLASS);
+        logHandler.addServerBindings("http://*/logs", "https://*/logs");
+        addComponent(logHandler);
+    }
+
 }
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 096189cabfe..adc6c7d5ec3 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
@@ -16,6 +16,7 @@ public class ClusterControllerContainerCluster extends ContainerCluster<ClusterC
 {
     public ClusterControllerContainerCluster(AbstractConfigProducer<?> parent, String subId, String name, DeployState deployState) {
         super(parent, subId, name, deployState);
+        addDefaultHandlersWithVip();
     }
 
     @Override