summaryrefslogtreecommitdiffstats
path: root/configserver/src/main/sh/stop-configserver
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2022-10-25 17:37:05 +0200
committerGitHub <noreply@github.com>2022-10-25 17:37:05 +0200
commitf73ba9276acf8b1032d1c015c434bf544317fad1 (patch)
treeb7b02d5d5ba5e682cc5731e0a05e17efc21930ed /configserver/src/main/sh/stop-configserver
parent373c68b2955c8a9ef77daa4e38622eec274b54ea (diff)
parent1417a48bd4aecfb5e182d6c7b81960e3d7232309 (diff)
Merge pull request #24548 from vespa-engine/arnej/common-handle-env-root
* apply new common bootstrap
Diffstat (limited to 'configserver/src/main/sh/stop-configserver')
-rwxr-xr-xconfigserver/src/main/sh/stop-configserver12
1 files changed, 5 insertions, 7 deletions
diff --git a/configserver/src/main/sh/stop-configserver b/configserver/src/main/sh/stop-configserver
index ae03a8b1b39..2ee6ac4fccf 100755
--- a/configserver/src/main/sh/stop-configserver
+++ b/configserver/src/main/sh/stop-configserver
@@ -72,23 +72,21 @@ findhost () {
findroot
findhost
-# END environment bootstrap section
-
ROOT=${VESPA_HOME%/}
export ROOT
-cd $ROOT || { echo "Cannot cd to $ROOT" 1>&2; exit 1; }
-# get common PATH etc:
-. $ROOT/libexec/vespa/common-env.sh
+# END environment bootstrap section
+
+cd ${VESPA_HOME} || { echo "Cannot cd to ${VESPA_HOME}" 1>&2; exit 1; }
fixlimits
# runserver takes care of making sure that we're not running several
# instances and saving its pid in this file:
-PIDFILE_CONFIGSERVER=${ROOT}/var/run/configserver.pid
+PIDFILE_CONFIGSERVER=${VESPA_HOME}/var/run/configserver.pid
PIDFILE_LOGD=var/run/logd.pid
-VESPA_LOG_TARGET="file:${ROOT}/logs/vespa/vespa.log"
+VESPA_LOG_TARGET="file:${VESPA_HOME}/logs/vespa/vespa.log"
export VESPA_LOG_TARGET
if [ "$cloudconfig_server__multitenant" = "true" ] || [ "$VESPA_CONFIGSERVER_MULTITENANT" = "true" ]; then