aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Marius Venstad <jonmv@users.noreply.github.com>2021-09-27 16:06:34 +0200
committerGitHub <noreply@github.com>2021-09-27 16:06:34 +0200
commit5af5d4051e7b9695e1ed6db515344052c78e09e0 (patch)
treeeda1257384a0c763455d8e2391c16ef5b04f31e0
parent281ade2f5c140be4064e3eacc588ba8c6ce08e78 (diff)
Revert "Use default value of jdisc.debug.resources."
-rwxr-xr-xconfigserver/src/main/sh/start-configserver1
-rwxr-xr-xcontainer-disc/src/main/sh/vespa-start-container-daemon.sh1
-rwxr-xr-xstandalone-container/src/main/sh/standalone-container.sh1
3 files changed, 3 insertions, 0 deletions
diff --git a/configserver/src/main/sh/start-configserver b/configserver/src/main/sh/start-configserver
index 965dc8756be..f9eb5e3a0a5 100755
--- a/configserver/src/main/sh/start-configserver
+++ b/configserver/src/main/sh/start-configserver
@@ -188,6 +188,7 @@ vespa-run-as-vespa-user vespa-runserver -s configserver -r 30 -p $pidfile -- \
-Djdisc.config.file=$cfpfile \
-Djdisc.export.packages= \
-Djdisc.cache.path=$bundlecachedir \
+ -Djdisc.debug.resources=false \
-Djdisc.bundle.path=${VESPA_HOME}/lib/jars \
-Djdisc.logger.enabled=true \
-Djdisc.logger.level=ALL \
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 2d9bbcf21fc..f09a17de5e5 100755
--- a/container-disc/src/main/sh/vespa-start-container-daemon.sh
+++ b/container-disc/src/main/sh/vespa-start-container-daemon.sh
@@ -212,6 +212,7 @@ exec $numactlcmd $envcmd java \
-Djdisc.config.file="$cfpfile" \
-Djdisc.export.packages=${jdisc_export_packages} \
-Djdisc.cache.path="$bundlecachedir" \
+ -Djdisc.debug.resources=false \
-Djdisc.bundle.path="${VESPA_HOME}/lib/jars" \
-Djdisc.logger.enabled=false \
-Djdisc.logger.level=ALL \
diff --git a/standalone-container/src/main/sh/standalone-container.sh b/standalone-container/src/main/sh/standalone-container.sh
index e6cbb435b6f..b30a7ad4cd0 100755
--- a/standalone-container/src/main/sh/standalone-container.sh
+++ b/standalone-container/src/main/sh/standalone-container.sh
@@ -180,6 +180,7 @@ StartCommand() {
-Djdisc.config.file="$cfpfile" \
-Djdisc.export.packages= \
-Djdisc.cache.path="$bundlecachedir" \
+ -Djdisc.debug.resources=false \
-Djdisc.bundle.path="$VESPA_HOME/lib/jars" \
-Djdisc.logger.enabled=true \
-Djdisc.logger.level=ALL \