aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2022-05-10 15:23:29 +0200
committergjoranv <gjoranv@gmail.com>2022-05-10 22:28:45 +0200
commitac03a5b8316d0dea32b49fe46539275fdab188ba (patch)
tree6f96519aff5e285386fc4fd064fb2cdcdd473fb5
parentd8f393420f0e3fffa981d52dc9d969a22c1dfdc0 (diff)
Switch off jdisc ConsoleLogManagerv7.585.20
- vespalog is now set up before loading the application.
-rwxr-xr-xconfigserver/src/main/sh/start-configserver2
-rwxr-xr-xcontainer-disc/src/main/sh/vespa-start-container-daemon.sh2
-rwxr-xr-xstandalone-container/src/main/sh/standalone-container.sh2
3 files changed, 3 insertions, 3 deletions
diff --git a/configserver/src/main/sh/start-configserver b/configserver/src/main/sh/start-configserver
index acf4811a522..29fbfa9a3c1 100755
--- a/configserver/src/main/sh/start-configserver
+++ b/configserver/src/main/sh/start-configserver
@@ -190,7 +190,7 @@ vespa-run-as-vespa-user vespa-runserver -s ${VESPA_SERVICE_NAME} -r 30 -p $pidfi
-Djdisc.export.packages= \
-Djdisc.cache.path=$bundlecachedir \
-Djdisc.bundle.path=${VESPA_HOME}/lib/jars \
- -Djdisc.logger.enabled=true \
+ -Djdisc.logger.enabled=false \
-Djdisc.logger.level=WARNING \
-Djdisc.logger.tag=${VESPA_SERVICE_NAME} \
-Dfile.encoding=UTF-8 \
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 0f017b8bba2..1b943aa0591 100755
--- a/container-disc/src/main/sh/vespa-start-container-daemon.sh
+++ b/container-disc/src/main/sh/vespa-start-container-daemon.sh
@@ -302,7 +302,7 @@ exec $numactlcmd $envcmd java \
-Djdisc.export.packages=${jdisc_export_packages} \
-Djdisc.cache.path="$bundlecachedir" \
-Djdisc.bundle.path="${VESPA_HOME}/lib/jars" \
- -Djdisc.logger.enabled=true \
+ -Djdisc.logger.enabled=false \
-Djdisc.logger.level=WARNING \
-Djdisc.logger.tag="${VESPA_CONFIG_ID}" \
-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.Jdk14Logger \
diff --git a/standalone-container/src/main/sh/standalone-container.sh b/standalone-container/src/main/sh/standalone-container.sh
index a2304621845..5ad6ce0a583 100755
--- a/standalone-container/src/main/sh/standalone-container.sh
+++ b/standalone-container/src/main/sh/standalone-container.sh
@@ -191,7 +191,7 @@ StartCommand() {
-Djdisc.export.packages= \
-Djdisc.cache.path="$bundlecachedir" \
-Djdisc.bundle.path="$VESPA_HOME/lib/jars" \
- -Djdisc.logger.enabled=true \
+ -Djdisc.logger.enabled=false \
-Djdisc.logger.level=WARNING \
-Djdisc.logger.tag="$service" \
-Dfile.encoding=UTF-8 \