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 /config-proxy | |
| parent | fa29e75a71b49fc3925349457bb43de03b6d60d8 (diff) | |
* apply new common bootstrap
* remove now-duplicated code
* prefer using ${VESPA_HOME} environment variable
Diffstat (limited to 'config-proxy')
| -rwxr-xr-x | config-proxy/src/main/sh/vespa-config-ctl.sh | 13 | ||||
| -rw-r--r-- | config-proxy/src/main/sh/vespa-config-loadtester.sh | 6 | ||||
| -rw-r--r-- | config-proxy/src/main/sh/vespa-config-verification.sh | 6 |
3 files changed, 13 insertions, 12 deletions
diff --git a/config-proxy/src/main/sh/vespa-config-ctl.sh b/config-proxy/src/main/sh/vespa-config-ctl.sh index d6d0075b555..e02073787db 100755 --- a/config-proxy/src/main/sh/vespa-config-ctl.sh +++ b/config-proxy/src/main/sh/vespa-config-ctl.sh @@ -72,21 +72,22 @@ findhost () { findroot findhost -# END environment bootstrap section - ROOT=${VESPA_HOME%/} export ROOT -cd $ROOT || { echo "Cannot cd to $ROOT" 1>&2; exit 1; } + +# END environment bootstrap section + +cd ${VESPA_HOME} || { echo "Cannot cd to ${VESPA_HOME}" 1>&2; exit 1; } P_SENTINEL=var/run/sentinel.pid P_CONFIG_PROXY=var/run/configproxy.pid export P_SENTINEL P_CONFIG_PROXY -LOGDIR="$ROOT/logs/vespa" +LOGDIR="${VESPA_HOME}/logs/vespa" LOGFILE="$LOGDIR/vespa.log" VESPA_LOG_TARGET="file:$LOGFILE" -VESPA_LOG_CONTROL_DIR="$ROOT/var/db/vespa/logcontrol" +VESPA_LOG_CONTROL_DIR="${VESPA_HOME}/var/db/vespa/logcontrol" cp="libexec/vespa/patches/configproxy:lib/jars/config-proxy-jar-with-dependencies.jar" VESPA_LOG_LEVEL="all -debug -spam" @@ -101,7 +102,7 @@ hname=$(vespa-print-default hostname) CONFIG_ID="hosts/$hname" export CONFIG_ID export MALLOC_ARENA_MAX=1 #Does not need fast allocation -export LD_LIBRARY_PATH="$VESPA_HOME/lib64" +export LD_LIBRARY_PATH="${VESPA_HOME}/lib64" case $1 in diff --git a/config-proxy/src/main/sh/vespa-config-loadtester.sh b/config-proxy/src/main/sh/vespa-config-loadtester.sh index 2dcf006aa1d..9da84e1edc3 100644 --- a/config-proxy/src/main/sh/vespa-config-loadtester.sh +++ b/config-proxy/src/main/sh/vespa-config-loadtester.sh @@ -72,11 +72,11 @@ findhost () { findroot findhost -# END environment bootstrap section - ROOT=${VESPA_HOME%/} export ROOT +# END environment bootstrap section + echo "# Using CLASSPATH=$CLASSPATH, args=$@" -java -Xms1g -Xmx1g -cp $CLASSPATH:$ROOT/lib/jars/config-proxy-jar-with-dependencies.jar com.yahoo.vespa.config.benchmark.LoadTester "$@" +java -Xms1g -Xmx1g -cp $CLASSPATH:${VESPA_HOME}/lib/jars/config-proxy-jar-with-dependencies.jar com.yahoo.vespa.config.benchmark.LoadTester "$@" diff --git a/config-proxy/src/main/sh/vespa-config-verification.sh b/config-proxy/src/main/sh/vespa-config-verification.sh index 178193fdbd5..dadf27bd0a3 100644 --- a/config-proxy/src/main/sh/vespa-config-verification.sh +++ b/config-proxy/src/main/sh/vespa-config-verification.sh @@ -72,11 +72,11 @@ findhost () { findroot findhost -# END environment bootstrap section - ROOT=${VESPA_HOME%/} export ROOT +# END environment bootstrap section + echo "# Using CLASSPATH=$CLASSPATH, args=$@" -java -cp $CLASSPATH:$ROOT/lib/jars/config-proxy-jar-with-dependencies.jar com.yahoo.vespa.config.proxy.ConfigVerification "$@" +java -cp $CLASSPATH:${VESPA_HOME}/lib/jars/config-proxy-jar-with-dependencies.jar com.yahoo.vespa.config.proxy.ConfigVerification "$@" |