Set up http after all components that set up http bindings.
In preparation for automatic binding setup for athens.
@@ -135,7 +135,6 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
addConfiguredComponents(cluster, spec);
addHandlers(cluster, spec);
- addHttp(spec, cluster);
addRestApis(spec, cluster);
addServlets(spec, cluster);
addProcessing(spec, cluster);
@@ -143,6 +142,13 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
addDocproc(spec, cluster);
addDocumentApi(spec, cluster); // NOTE: Must be done after addSearch
+ addDefaultHandlers(cluster);
+ addStatusHandlers(cluster, context);
+ addDefaultComponents(cluster);
+ setDefaultMetricConsumerFactory(cluster);
+
+ addHttp(spec, cluster);
+
addAccessLogs(cluster, spec);
addRoutingAliases(cluster, spec, context.getDeployState().zone().environment());
addNodes(cluster, spec, context);
@@ -151,11 +157,6 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
addServerProviders(spec, cluster);
addLegacyFilters(spec, cluster); // TODO: Remove for Vespa 7
- addDefaultHandlers(cluster);
- addStatusHandlers(cluster, context);
- addDefaultComponents(cluster);
- setDefaultMetricConsumerFactory(cluster);
-
//TODO: overview handler, see DomQrserverClusterBuilder
//TODO: cache options.
}
