diff options
author | Harald Musum <musum@verizonmedia.com> | 2021-03-15 12:28:20 +0100 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2021-03-15 12:28:20 +0100 |
commit | 38f00bff565db56074b1295dff640740378ebde1 (patch) | |
tree | a7f31366079090f4f2f783fdc302abdc3ae19ad8 | |
parent | 2544fbabc17c29a209f290b055ffca036a6f17cd (diff) |
GC unused env variables
-rw-r--r-- | config/src/vespa/config/frt/protocol.cpp | 9 | ||||
-rw-r--r-- | defaults/src/vespa/defaults.cpp | 3 | ||||
-rw-r--r-- | vespabase/conf/services.conf | 6 | ||||
-rwxr-xr-x | vespabase/src/common-env.sh | 2 |
4 files changed, 0 insertions, 20 deletions
diff --git a/config/src/vespa/config/frt/protocol.cpp b/config/src/vespa/config/frt/protocol.cpp index 269c3477ba8..4a1b0a6ddef 100644 --- a/config/src/vespa/config/frt/protocol.cpp +++ b/config/src/vespa/config/frt/protocol.cpp @@ -115,9 +115,6 @@ readProtocolVersion() { int protocolVersion = DEFAULT_PROTOCOL_VERSION; char *versionStringPtr = getenv("VESPA_CONFIG_PROTOCOL_VERSION"); - if (versionStringPtr == NULL) { - versionStringPtr = getenv("services__config_protocol_version_override"); - } if (versionStringPtr != NULL) { std::stringstream versionString(versionStringPtr); versionString >> protocolVersion; @@ -130,9 +127,6 @@ readTraceLevel() { int traceLevel = DEFAULT_TRACE_LEVEL; char *traceLevelStringPtr = getenv("VESPA_CONFIG_PROTOCOL_TRACELEVEL"); - if (traceLevelStringPtr == NULL) { - traceLevelStringPtr = getenv("services__config_protocol_tracelevel"); - } if (traceLevelStringPtr != NULL) { std::stringstream traceLevelString(traceLevelStringPtr); traceLevelString >> traceLevel; @@ -145,9 +139,6 @@ readProtocolCompressionType() { CompressionType type = CompressionType::LZ4; char *compressionTypeStringPtr = getenv("VESPA_CONFIG_PROTOCOL_COMPRESSION"); - if (compressionTypeStringPtr == NULL) { - compressionTypeStringPtr = getenv("services__config_protocol_compression"); - } if (compressionTypeStringPtr != NULL) { type = stringToCompressionType(vespalib::string(compressionTypeStringPtr)); } diff --git a/defaults/src/vespa/defaults.cpp b/defaults/src/vespa/defaults.cpp index 0ddd12d234e..069187ac284 100644 --- a/defaults/src/vespa/defaults.cpp +++ b/defaults/src/vespa/defaults.cpp @@ -118,9 +118,6 @@ int findConfigProxyPort(int defPort) { const char *findConfigServers(const char *defServers) { const char *env = getenv("VESPA_CONFIGSERVERS"); if (env == NULL || *env == '\0') { - env = getenv("services__addr_configserver"); - } - if (env == NULL || *env == '\0') { env = getenv("addr_configserver"); } if (env != NULL && *env != '\0') { diff --git a/vespabase/conf/services.conf b/vespabase/conf/services.conf deleted file mode 100644 index dd0988e185a..00000000000 --- a/vespabase/conf/services.conf +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -cat <<END -config_protocol_version_override ${services__config_protocol_version_override:-} -addr_configserver ${services__addr_configserver:-} -port_configserver_rpc ${services__port_configserver_rpc:-} -END diff --git a/vespabase/src/common-env.sh b/vespabase/src/common-env.sh index 011140b4633..efdfa261509 100755 --- a/vespabase/src/common-env.sh +++ b/vespabase/src/common-env.sh @@ -64,10 +64,8 @@ get_var() { ret_val=$2 env_var_name=`echo $arg | tr '[:lower:]' '[:upper:]'` - prefixed_var_name1=services__${arg} if varhasvalue $env_var_name ; then eval "ret_val=\${$env_var_name}" - elif varhasvalue $prefixed_var_name1 ; then eval "ret_val=\${$prefixed_var_name1}" fi echo "$ret_val" } |