diff options
| author | Harald Musum <musum@verizonmedia.com> | 2020-01-10 10:22:22 +0100 |
|---|---|---|
| committer | Harald Musum <musum@verizonmedia.com> | 2020-01-10 10:22:22 +0100 |
| commit | 5bee209f1e1edc2571ffbb8a234ef9fab24cee8f (patch) | |
| tree | 3a07521981a1c4e1c4ca46e7d69a7b38d9437399 /configserver | |
| parent | f77006746634b570aac00847c2ebe426c5e40808 (diff) | |
Use recommended syntax
Diffstat (limited to 'configserver')
| -rw-r--r-- | configserver/src/main/sh/start-logd | 2 | ||||
| -rwxr-xr-x | configserver/src/main/sh/stop-configserver | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/configserver/src/main/sh/start-logd b/configserver/src/main/sh/start-logd index 0a9a84a21dc..1148affeb86 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" || "$VESPA_CONFIGSERVER_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 c24e6ffa347..21dda50b0a2 100755 --- a/configserver/src/main/sh/stop-configserver +++ b/configserver/src/main/sh/stop-configserver @@ -91,7 +91,7 @@ PIDFILE_LOGD=var/run/logd.pid VESPA_LOG_TARGET="file:${ROOT}/logs/vespa/vespa.log" export VESPA_LOG_TARGET -if [ "$cloudconfig_server__multitenant" = "true" || "$VESPA_CONFIGSERVER_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 |