diff options
author | Arne Juul <arnej@yahooinc.com> | 2022-10-24 10:02:58 +0000 |
---|---|---|
committer | Arne Juul <arnej@yahooinc.com> | 2022-10-24 10:02:58 +0000 |
commit | 1417a48bd4aecfb5e182d6c7b81960e3d7232309 (patch) | |
tree | 256cff43ab30ea2c5efbe31c9d1ad7eb316eefea /configserver | |
parent | fa29e75a71b49fc3925349457bb43de03b6d60d8 (diff) |
* apply new common bootstrap
* remove now-duplicated code
* prefer using ${VESPA_HOME} environment variable
Diffstat (limited to 'configserver')
-rwxr-xr-x | configserver/src/main/sh/start-configserver | 3 | ||||
-rw-r--r-- | configserver/src/main/sh/start-logd | 9 | ||||
-rwxr-xr-x | configserver/src/main/sh/stop-configserver | 12 | ||||
-rwxr-xr-x | configserver/src/main/sh/vespa-configserver-remove-state | 8 |
4 files changed, 18 insertions, 14 deletions
diff --git a/configserver/src/main/sh/start-configserver b/configserver/src/main/sh/start-configserver index 8e7a9d7839a..a16a93741e0 100755 --- a/configserver/src/main/sh/start-configserver +++ b/configserver/src/main/sh/start-configserver @@ -72,6 +72,9 @@ findhost () { findroot findhost +ROOT=${VESPA_HOME%/} +export ROOT + # END environment bootstrap section cd ${VESPA_HOME} || { echo "Cannot cd to ${VESPA_HOME}" 1>&2; exit 1; } diff --git a/configserver/src/main/sh/start-logd b/configserver/src/main/sh/start-logd index 47d62aae3a8..30aa357de12 100644 --- a/configserver/src/main/sh/start-logd +++ b/configserver/src/main/sh/start-logd @@ -72,15 +72,16 @@ findhost () { findroot findhost -# END environment bootstrap section - ROOT=${VESPA_HOME%/} +export ROOT + +# END environment bootstrap section -export VESPA_CONFIG_ID="file:$VESPA_HOME/conf/logd/logd.cfg" +export VESPA_CONFIG_ID="file:${VESPA_HOME}/conf/logd/logd.cfg" if [ "$cloudconfig_server__multitenant" = "true" ] || [ "$VESPA_CONFIGSERVER_MULTITENANT" = "true" ]; then PIDFILE_LOGD=var/run/logd.pid VESPA_SERVICE_NAME=logd export VESPA_SERVICE_NAME - vespa-runserver -r 30 -s logd -p $PIDFILE_LOGD -- ${ROOT}/sbin/vespa-logd + vespa-runserver -r 30 -s logd -p $PIDFILE_LOGD -- ${VESPA_HOME}/sbin/vespa-logd fi 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 diff --git a/configserver/src/main/sh/vespa-configserver-remove-state b/configserver/src/main/sh/vespa-configserver-remove-state index 466a68522ca..cd371b1073e 100755 --- a/configserver/src/main/sh/vespa-configserver-remove-state +++ b/configserver/src/main/sh/vespa-configserver-remove-state @@ -72,10 +72,12 @@ findhost () { findroot findhost +ROOT=${VESPA_HOME%/} +export ROOT + # END environment bootstrap section -ROOT=${VESPA_HOME%/} -cd $ROOT || { echo "Cannot cd to $ROOT" 1>&2; exit 1; } +cd ${VESPA_HOME} || { echo "Cannot cd to ${VESPA_HOME}" 1>&2; exit 1; } usage() { ( @@ -128,7 +130,7 @@ removedata() { confirm() { confirmed=false - echo -n 'Really remove state for config server in '$ROOT/$1'? Type "yes" if you are sure ==> ' 1>&2 + echo -n 'Really remove state for config server in '${VESPA_HOME}/$1'? Type "yes" if you are sure ==> ' 1>&2 answer=no read answer if [ "$answer" = "yes" ]; then |