diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-05-09 15:54:38 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-09 15:54:38 +0200 |
commit | f2f303d155655e6652ec7b9de680ca575e67d078 (patch) | |
tree | 253a2f74cc37f0bc236fc258dde22683e0a9c9fe /container-disc | |
parent | 183ef58a4c6972a8f222778e4c0ccb4615e1a9ef (diff) |
Revert "Setup vespalog in jdisc core [run-systemtest]"
Diffstat (limited to 'container-disc')
-rw-r--r-- | container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java | 5 |
1 files changed, 3 insertions, 2 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 ab764e97fa0..2c25f38437a 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 @@ -42,7 +42,7 @@ import com.yahoo.jrt.Supervisor; import com.yahoo.jrt.Transport; import com.yahoo.jrt.slobrok.api.Register; import com.yahoo.jrt.slobrok.api.SlobrokList; -import com.yahoo.log.impl.InitializeLog; +import com.yahoo.log.LogSetup; import com.yahoo.messagebus.network.rpc.SlobrokConfigSubscriber; import com.yahoo.net.HostName; import com.yahoo.vespa.config.ConfigKey; @@ -109,7 +109,7 @@ public final class ConfiguredApplication implements Application { private volatile boolean shutdownReconfiguration = false; static { - InitializeLog.init(); + LogSetup.initVespaLogging("Container"); log.log(Level.INFO, "Starting jdisc" + (Vtag.currentVersion.isEmpty() ? "" : " at version " + Vtag.currentVersion)); installBouncyCastleSecurityProvider(); } @@ -460,6 +460,7 @@ public final class ConfiguredApplication implements Application { slobrokConfigSubscriber.ifPresent(SlobrokConfigSubscriber::shutdown); Container.get().shutdown(); unregisterInSlobrok(); + LogSetup.cleanup(); shutdownDeadline.cancel(); log.info("Destroy: Finished"); } |