diff options
| author | Harald Musum <musum@verizonmedia.com> | 2020-01-10 12:11:20 +0100 |
|---|---|---|
| committer | Harald Musum <musum@verizonmedia.com> | 2020-01-10 12:11:20 +0100 |
| commit | c40d02e256eedd62ec8eab2735652e8fb217cd5e (patch) | |
| tree | 8a3e781bb0dae86c61a8f3a5b028ebfc3f29323d /container-disc | |
| parent | f77006746634b570aac00847c2ebe426c5e40808 (diff) | |
Make sure to close file handler used for zookeeper log messages
This avoid .lck files being left behind after stopping container
Diffstat (limited to 'container-disc')
| -rw-r--r-- | container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java | 1 | ||||
| -rwxr-xr-x | container-disc/src/main/sh/vespa-start-container-daemon.sh | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java index ab8162b9ae0..e174de19394 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java @@ -367,6 +367,7 @@ public final class ConfiguredApplication implements Application { Container.get().shutdown(); unregisterInSlobrok(); + LogSetup.cleanup(); log.info("Stop: Finished"); } 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 228f731fd5c..160caa933d5 100755 --- a/container-disc/src/main/sh/vespa-start-container-daemon.sh +++ b/container-disc/src/main/sh/vespa-start-container-daemon.sh @@ -23,7 +23,6 @@ DISCRIMINATOR=`echo ${VESPA_CONFIG_ID} | md5sum | cut -d' ' -f1` CONTAINER_HOME="${VESPA_HOME}/var/jdisc_container/${DISCRIMINATOR}/" ZOOKEEPER_LOG_FILE="${VESPA_HOME}/logs/vespa/zookeeper.${VESPA_SERVICE_NAME}.log" -rm -f $ZOOKEEPER_LOG_FILE*lck # common setup export VESPA_LOG_TARGET=file:${VESPA_HOME}/logs/vespa/vespa.log |