summaryrefslogtreecommitdiffstats
path: root/container-disc
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@yahoo-inc.com>2017-05-08 15:55:02 +0200
committerBjørn Christian Seime <bjorncs@yahoo-inc.com>2017-05-08 16:13:56 +0200
commit1e7efd7ddabb9fff21c9d76a2ff764bd7b740cd1 (patch)
tree8566708abeaa68b4abf44890388d72655e7f601d /container-disc
parentb374b62e10cd3e97a74234117546ba95d29403c1 (diff)
Run extension script if exists
Diffstat (limited to 'container-disc')
-rwxr-xr-xcontainer-disc/src/main/sh/vespa-start-container-daemon.sh8
1 files changed, 8 insertions, 0 deletions
diff --git a/container-disc/src/main/sh/vespa-start-container-daemon.sh b/container-disc/src/main/sh/vespa-start-container-daemon.sh
index dd79e0dd054..d76be872d63 100755
--- a/container-disc/src/main/sh/vespa-start-container-daemon.sh
+++ b/container-disc/src/main/sh/vespa-start-container-daemon.sh
@@ -247,6 +247,13 @@ maybe_use_jsvc () {
fi
}
+maybe_run_extensions() {
+ vespa_extensions_script="${VESPA_HOME}libexec/vespa/jdisc-extensions.sh"
+ if [ -f "${vespa_extensions_script}" ]; then
+ . "${vespa_extensions_script}"
+ fi
+}
+
getconfig
configure_memory
configure_gcopts
@@ -255,6 +262,7 @@ configure_classpath
configure_numactl
configure_preload
maybe_use_jsvc
+maybe_run_extensions
exec $numactlcmd $envcmd java \
-Dconfig.id="${VESPA_CONFIG_ID}" \