diff options
author | Harald Musum <musum@verizonmedia.com> | 2019-12-11 19:16:32 +0100 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2019-12-11 19:16:32 +0100 |
commit | 1fe7b497cf2b24b458634704641ff4bf8426b89c (patch) | |
tree | b7becc7627862dc2d359bb743cf18848a257a44c /standalone-container/src/main | |
parent | 161254b00e1189020bfa9fcf3ecc2bdf4dc210bf (diff) |
Support documented VESPA_CONFIGSERVER_RPC_PORT environment variable
Diffstat (limited to 'standalone-container/src/main')
-rw-r--r-- | standalone-container/src/main/java/com/yahoo/container/standalone/CloudConfigInstallVariables.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/standalone-container/src/main/java/com/yahoo/container/standalone/CloudConfigInstallVariables.java b/standalone-container/src/main/java/com/yahoo/container/standalone/CloudConfigInstallVariables.java index b77325dce93..3d3197ddd1c 100644 --- a/standalone-container/src/main/java/com/yahoo/container/standalone/CloudConfigInstallVariables.java +++ b/standalone-container/src/main/java/com/yahoo/container/standalone/CloudConfigInstallVariables.java @@ -15,7 +15,9 @@ public class CloudConfigInstallVariables implements CloudConfigOptions { @Override public Optional<Integer> rpcPort() { - return getInstallVariable("port_configserver_rpc", "services", Integer::parseInt); + return Optional.ofNullable(System.getenv("VESPA_CONFIGSERVER_RPC_PORT")) + .or(() -> getRawInstallVariable("services.port_configserver_rpc")) + .map(Integer::parseInt); } @Override |