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 /standalone-container | |
parent | fa29e75a71b49fc3925349457bb43de03b6d60d8 (diff) |
* apply new common bootstrap
* remove now-duplicated code
* prefer using ${VESPA_HOME} environment variable
Diffstat (limited to 'standalone-container')
-rwxr-xr-x | standalone-container/src/main/sh/standalone-container.sh | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/standalone-container/src/main/sh/standalone-container.sh b/standalone-container/src/main/sh/standalone-container.sh index f55a6df5b76..9a780f29c86 100755 --- a/standalone-container/src/main/sh/standalone-container.sh +++ b/standalone-container/src/main/sh/standalone-container.sh @@ -72,6 +72,9 @@ findhost () { findroot findhost +ROOT=${VESPA_HOME%/} +export ROOT + # END environment bootstrap section Usage() { @@ -120,7 +123,7 @@ StartCommand() { Fail "Service must match regex '$service_regex'" fi - local pidfile="$VESPA_HOME/var/run/$service.pid" + local pidfile="${VESPA_HOME}/var/run/$service.pid" if [ "$force" = false ] && test -r "$pidfile"; then echo "$service is already running as PID $(< "$pidfile") according to $pidfile" return @@ -130,11 +133,11 @@ StartCommand() { export VESPA_SERVICE_NAME="$service" # stuff for the process: - local appdir="$VESPA_HOME/conf/$service-app" - local cfpfile="$VESPA_HOME/var/jdisc_container/$service.properties" - local bundlecachedir="$VESPA_HOME/var/vespa/bundlecache/$service" + local appdir="${VESPA_HOME}/conf/$service-app" + local cfpfile="${VESPA_HOME}/var/jdisc_container/$service.properties" + local bundlecachedir="${VESPA_HOME}/var/vespa/bundlecache/$service" - cd "$VESPA_HOME" || Fail "Cannot cd to $VESPA_HOME" + cd "${VESPA_HOME}" || Fail "Cannot cd to ${VESPA_HOME}" fixlimits @@ -145,11 +148,11 @@ StartCommand() { FixDataDirectory "$(dirname "$pidfile")" - local vespa_log="$VESPA_HOME/logs/vespa/vespa.log" + local vespa_log="${VESPA_HOME}/logs/vespa/vespa.log" export VESPA_LOG_TARGET="file:$vespa_log" FixDataDirectory "$(dirname "$vespa_log")" - export VESPA_LOG_CONTROL_FILE="$VESPA_HOME/var/db/vespa/logcontrol/$service.logcontrol" + export VESPA_LOG_CONTROL_FILE="${VESPA_HOME}/var/db/vespa/logcontrol/$service.logcontrol" export VESPA_LOG_CONTROL_DIR="$(dirname "$VESPA_LOG_CONTROL_FILE")" FixDataDirectory "$VESPA_LOG_CONTROL_DIR" @@ -160,12 +163,12 @@ StartCommand() { export standalone_jdisc_container__app_location="$appdir" # class path - CP="$VESPA_HOME/lib/jars/jdisc_core-jar-with-dependencies.jar" + CP="${VESPA_HOME}/lib/jars/jdisc_core-jar-with-dependencies.jar" FixDataDirectory "$(dirname "$cfpfile")" printenv > "$cfpfile" FixDataDirectory "$bundlecachedir" - FixDataDirectory "$VESPA_HOME/var/crash" + FixDataDirectory "${VESPA_HOME}/var/crash" heap_min=$(get_min_heap_mb "${jvm_arguments}" 128) heap_max=$(get_max_heap_mb "${jvm_arguments}" 2048) @@ -174,7 +177,7 @@ StartCommand() { -XX:+PreserveFramePointer \ $(get_jvm_hugepage_settings $heap_max) \ -XX:+HeapDumpOnOutOfMemoryError \ - -XX:HeapDumpPath="$VESPA_HOME/var/crash" \ + -XX:HeapDumpPath="${VESPA_HOME}/var/crash" \ -XX:+ExitOnOutOfMemoryError \ --add-opens=java.base/java.io=ALL-UNNAMED \ --add-opens=java.base/java.lang=ALL-UNNAMED \ @@ -182,7 +185,7 @@ StartCommand() { --add-opens=java.base/java.nio=ALL-UNNAMED \ --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED \ --add-opens=java.base/sun.security.ssl=ALL-UNNAMED \ - -Djava.library.path="$VESPA_HOME/lib64" \ + -Djava.library.path="${VESPA_HOME}/lib64" \ -Djava.security.properties=${VESPA_HOME}/conf/vespa/java.security.override \ -Djava.awt.headless=true \ -Dsun.rmi.dgc.client.gcInterval=3600000 \ @@ -193,7 +196,7 @@ StartCommand() { -Djdisc.config.file="$cfpfile" \ -Djdisc.export.packages= \ -Djdisc.cache.path="$bundlecachedir" \ - -Djdisc.bundle.path="$VESPA_HOME/lib/jars" \ + -Djdisc.bundle.path="${VESPA_HOME}/lib/jars" \ -Djdisc.logger.enabled=false \ -Djdisc.logger.level=WARNING \ -Djdisc.logger.tag="$service" \ @@ -270,7 +273,7 @@ StopCommand() { local service="$2" local force="$3" - local pidfile="$VESPA_HOME/var/run/$service.pid" + local pidfile="${VESPA_HOME}/var/run/$service.pid" if ! test -r "$pidfile"; then echo "$service is not running" return |