From 76116decafa1f54a8c1068518d0a56e03ef7e973 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Thu, 9 Jan 2020 10:50:38 +0100 Subject: Check VESPA_CONFIGSERVER_MULTITENANT as well for starting and stopping logd --- configserver/src/main/sh/start-logd | 2 +- configserver/src/main/sh/stop-configserver | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'configserver/src/main/sh') diff --git a/configserver/src/main/sh/start-logd b/configserver/src/main/sh/start-logd index d8ed068537e..0a9a84a21dc 100644 --- a/configserver/src/main/sh/start-logd +++ b/configserver/src/main/sh/start-logd @@ -78,7 +78,7 @@ ROOT=${VESPA_HOME%/} export VESPA_CONFIG_ID="file:$VESPA_HOME/conf/logd/logd.cfg" -if [ "$cloudconfig_server__multitenant" = "true" ]; then +if [ "$cloudconfig_server__multitenant" = "true" || "$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 007ff7cdd62..c24e6ffa347 100755 --- a/configserver/src/main/sh/stop-configserver +++ b/configserver/src/main/sh/stop-configserver @@ -91,8 +91,7 @@ PIDFILE_LOGD=var/run/logd.pid VESPA_LOG_TARGET="file:${ROOT}/logs/vespa/vespa.log" export VESPA_LOG_TARGET -multitenant=$cloudconfig_server__multitenant -if [ "$multitenant" = "true" ]; then +if [ "$cloudconfig_server__multitenant" = "true" || "$VESPA_CONFIGSERVER_MULTITENANT" = "true" ]; then vespa-run-as-vespa-user vespa-runserver -s logd -p $PIDFILE_LOGD -S fi -- cgit v1.2.3