diff options
| author | Harald Musum <musum@verizonmedia.com> | 2020-01-09 12:02:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-09 12:02:24 +0100 |
| commit | e19542f74d4692729ef744b74f5ef0d0715c111f (patch) | |
| tree | d86fafb706e7c1a55b051b5213fcc7f3ce5d8f9d /configserver/src/main/sh | |
| parent | f36e9407cf94727c77cbfdfed24cbb0fc9f3b088 (diff) | |
| parent | 76116decafa1f54a8c1068518d0a56e03ef7e973 (diff) | |
Merge pull request #11715 from vespa-engine/hmusum/fix-logd-start-and-stop
Check VESPA_CONFIGSERVER_MULTITENANT as well for starting and stoppin…
Diffstat (limited to 'configserver/src/main/sh')
| -rw-r--r-- | configserver/src/main/sh/start-logd | 2 | ||||
| -rwxr-xr-x | configserver/src/main/sh/stop-configserver | 3 |
2 files changed, 2 insertions, 3 deletions
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 |