From 12147c678d10cef58fe61637e8f097add608d3d9 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Wed, 19 Apr 2023 12:23:09 +0200 Subject: GC undocumented env var that has been replaced by VESPA_CONFIGSERVER_MULTITENANT a long time ago --- client/go/internal/admin/envvars/env_vars.go | 1 - client/go/internal/admin/vespa-wrapper/configserver/logd.go | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'client/go/internal/admin') 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 { -- cgit v1.2.3