diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-04-20 10:20:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-20 10:20:36 +0200 |
| commit | 92101782a9ffebe1d815fbefa5d3ae0c7eab57f1 (patch) | |
| tree | 0a5013d185eb1a3d546a114bba44d724f0209b00 /client | |
| parent | f3837bf89c82d6030dbba082bc9e46fed75626e3 (diff) | |
| parent | 12147c678d10cef58fe61637e8f097add608d3d9 (diff) | |
Merge pull request #26781 from vespa-engine/hmusum/gc-old-env-var
GC undocumented env var
Diffstat (limited to 'client')
| -rw-r--r-- | client/go/internal/admin/envvars/env_vars.go | 1 | ||||
| -rw-r--r-- | client/go/internal/admin/vespa-wrapper/configserver/logd.go | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/client/go/internal/admin/envvars/env_vars.go b/client/go/internal/admin/envvars/env_vars.go index ad58338254c..a2a6415f484 100644 --- a/client/go/internal/admin/envvars/env_vars.go +++ b/client/go/internal/admin/envvars/env_vars.go @@ -7,7 +7,6 @@ package envvars const ( ADDR_CONFIGSERVER = "addr_configserver" - CLOUDCONFIG_SERVER_MULTITENANT = "cloudconfig_server__multitenant" CONFIGPROXY_RPC_PORT = "port_configproxy_rpc" CONFIGSERVER_RPC_PORT = "port_configserver_rpc" DEBUG_JVM_STARTUP = "DEBUG_JVM_STARTUP" diff --git a/client/go/internal/admin/vespa-wrapper/configserver/logd.go b/client/go/internal/admin/vespa-wrapper/configserver/logd.go index 39a2100b20f..8e1fb09548e 100644 --- a/client/go/internal/admin/vespa-wrapper/configserver/logd.go +++ b/client/go/internal/admin/vespa-wrapper/configserver/logd.go @@ -12,9 +12,7 @@ import ( ) func maybeStartLogd() { - v1 := os.Getenv(envvars.CLOUDCONFIG_SERVER_MULTITENANT) - v2 := os.Getenv(envvars.VESPA_CONFIGSERVER_MULTITENANT) - if v1 == "true" || v2 == "true" { + if os.Getenv(envvars.VESPA_CONFIGSERVER_MULTITENANT) == "true" { backticks := util.BackTicksForwardStderr out, err := backticks.Run("libexec/vespa/start-logd") if err != nil { |