diff options
author | Jon Bratseth <bratseth@yahoo-inc.com> | 2016-09-29 11:17:09 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2016-09-29 11:17:09 +0200 |
commit | d2218685ffb34460c9a79f90b5f1032c7022dd08 (patch) | |
tree | 5059cc702f56d643a753e2fdefc9dc1978109288 /standalone-container | |
parent | ca7c322c2b50764e3499435f091448ba3357fa35 (diff) |
Add todo for later cleanup
Diffstat (limited to 'standalone-container')
-rw-r--r-- | standalone-container/src/main/scala/com/yahoo/container/standalone/StandaloneContainerApplication.scala | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/standalone-container/src/main/scala/com/yahoo/container/standalone/StandaloneContainerApplication.scala b/standalone-container/src/main/scala/com/yahoo/container/standalone/StandaloneContainerApplication.scala index 9491a88b94f..6c79cd06bee 100644 --- a/standalone-container/src/main/scala/com/yahoo/container/standalone/StandaloneContainerApplication.scala +++ b/standalone-container/src/main/scala/com/yahoo/container/standalone/StandaloneContainerApplication.scala @@ -187,7 +187,6 @@ object StandaloneContainerApplication { deployState.getProperties.vespaVersion(), deployState.getProperties.applicationId()) - vespaRoot.setupAdmin(root.getAdmin) // TODO: Try to remove val spec = containerRootElement(applicationPackage) val containerModel = newContainerModelBuilder(networkingOption).build(deployState, configModelRepo, vespaRoot, spec) @@ -195,6 +194,10 @@ object StandaloneContainerApplication { containerModel.initialize(configModelRepo) val container = first(containerModel.getCluster().getContainers) + // TODO: If we can do the mutations below on the builder, we can separate out model finalization from the + // VespaModel constructor, such that the above and below code to finalize the container can be + // replaced by root.finalize(); + // Always disable rpc server for standalone container. This server will soon be removed anyway. container.setRpcServerEnabled(false) container.setHttpServerEnabled(networkingOption == Networking.enable) |