From b58cbe68e30c37cb67e4eb18e3a7a29a12722f1a Mon Sep 17 00:00:00 2001 From: Arne Juul Date: Fri, 13 Apr 2018 10:58:38 +0000 Subject: handle VESPA_CONFIGSERVERS * also some refactoring * also, make C++ code (in defaults) handle same variable variants, like services__addr_configserver * also, update some error messages to indicate that VESPA_CONFIGSERVERS is the variable we expected to use --- defaults/src/vespa/defaults.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'defaults/src') diff --git a/defaults/src/vespa/defaults.cpp b/defaults/src/vespa/defaults.cpp index d10e4064f83..05e621d2dc2 100644 --- a/defaults/src/vespa/defaults.cpp +++ b/defaults/src/vespa/defaults.cpp @@ -99,6 +99,12 @@ void findDefaults() { defaultPortConfigProxyRpc = defaultPortBase + 90; } env = getenv("VESPA_CONFIGSERVERS"); + if (env == NULL || *env == '\0') { + env = getenv("services__addr_configserver"); + } + if (env == NULL || *env == '\0') { + env = getenv("vespa_base__addr_configserver"); + } if (env == NULL || *env == '\0') { env = getenv("addr_configserver"); } -- cgit v1.2.3