aboutsummaryrefslogtreecommitdiffstats
path: root/standalone-container
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2022-02-07 12:53:29 +0100
committerGitHub <noreply@github.com>2022-02-07 12:53:29 +0100
commit3d13b2df6632929fba8fa63fd3a712190898d5cd (patch)
tree022807ab9c60b2a53db55d69b07c8afacfb819b9 /standalone-container
parent54171bfe721d07a521bcd7fad8c3c29dedb6cf38 (diff)
parent4a2fc66d8403b89d21691901fdb6e7e443719cc0 (diff)
Merge pull request #21090 from vespa-engine/balder/add-featureflag-control-for-general-environment-variables
- Adde featureflag for controlling environment variables.
Diffstat (limited to 'standalone-container')
-rw-r--r--standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerApplication.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerApplication.java b/standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerApplication.java
index 74eff01984f..fe3e8782973 100644
--- a/standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerApplication.java
+++ b/standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerApplication.java
@@ -256,7 +256,7 @@ public class StandaloneContainerApplication implements Application {
// such that the above and below code to finalize the container can be
// replaced by root.finalize();
- initializeContainer(deployState.getDeployLogger(), container, spec);
+ initializeContainer(deployState, container, spec);
root.freezeModelTopology();
return new Pair<>(root, container);
@@ -287,12 +287,12 @@ public class StandaloneContainerApplication implements Application {
return builder.build();
}
- private static void initializeContainer(DeployLogger deployLogger, Container container, Element spec) {
+ private static void initializeContainer(DeployState deployState, Container container, Element spec) {
HostResource host = container.getRoot().hostSystem().getHost(Container.SINGLENODE_CONTAINER_SERVICESPEC);
container.setBasePort(VespaDomBuilder.getXmlWantedPort(spec));
container.setHostResource(host);
- container.initService(deployLogger);
+ container.initService(deployState);
}
private static Element getJDiscInServices(Element element) {