diff options
| author | Arne Juul <arnej@yahoo-inc.com> | 2018-04-13 10:58:38 +0000 |
|---|---|---|
| committer | Arne Juul <arnej@yahoo-inc.com> | 2018-04-16 13:57:57 +0000 |
| commit | b58cbe68e30c37cb67e4eb18e3a7a29a12722f1a (patch) | |
| tree | de7e3312cc4a1c18a719958cb8ee0fa259c14c98 /defaults | |
| parent | 7c90afed7e18ebac57ba0dd7986c1a4159f78c98 (diff) | |
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
Diffstat (limited to 'defaults')
| -rw-r--r-- | defaults/src/vespa/defaults.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
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 @@ -100,6 +100,12 @@ void findDefaults() { } 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"); } if (env != NULL && *env != '\0') { |