summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorHarald Musum <musum@yahooinc.com>2023-04-19 12:23:09 +0200
committerHarald Musum <musum@yahooinc.com>2023-04-19 12:23:09 +0200
commit12147c678d10cef58fe61637e8f097add608d3d9 (patch)
tree4bd114d12f4839a852e2c3c442b5a78aa6d17136 /configserver
parent6e9583c9704c2a3275de4a28a85dfc5f39a10ac7 (diff)
GC undocumented env var that has been replaced by VESPA_CONFIGSERVER_MULTITENANT a long time ago
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/main/sh/start-logd2
-rwxr-xr-xconfigserver/src/main/sh/stop-configserver2
2 files changed, 2 insertions, 2 deletions
diff --git a/configserver/src/main/sh/start-logd b/configserver/src/main/sh/start-logd
index 30aa357de12..3339338cb15 100644
--- a/configserver/src/main/sh/start-logd
+++ b/configserver/src/main/sh/start-logd
@@ -79,7 +79,7 @@ export ROOT
export VESPA_CONFIG_ID="file:${VESPA_HOME}/conf/logd/logd.cfg"
-if [ "$cloudconfig_server__multitenant" = "true" ] || [ "$VESPA_CONFIGSERVER_MULTITENANT" = "true" ]; then
+if [ "$VESPA_CONFIGSERVER_MULTITENANT" = "true" ]; then
PIDFILE_LOGD=var/run/logd.pid
VESPA_SERVICE_NAME=logd
export VESPA_SERVICE_NAME
diff --git a/configserver/src/main/sh/stop-configserver b/configserver/src/main/sh/stop-configserver
index 2ee6ac4fccf..00e3e009e1a 100755
--- a/configserver/src/main/sh/stop-configserver
+++ b/configserver/src/main/sh/stop-configserver
@@ -89,7 +89,7 @@ PIDFILE_LOGD=var/run/logd.pid
VESPA_LOG_TARGET="file:${VESPA_HOME}/logs/vespa/vespa.log"
export VESPA_LOG_TARGET
-if [ "$cloudconfig_server__multitenant" = "true" ] || [ "$VESPA_CONFIGSERVER_MULTITENANT" = "true" ]; then
+if [ "$VESPA_CONFIGSERVER_MULTITENANT" = "true" ]; then
vespa-run-as-vespa-user vespa-runserver -s logd -p $PIDFILE_LOGD -S
fi