summaryrefslogtreecommitdiffstats
path: root/container-disc
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2022-05-09 17:57:24 +0200
committergjoranv <gjoranv@gmail.com>2022-05-10 22:28:45 +0200
commitf258b373610cad2743c12d723968621265012e25 (patch)
tree2cfca6e45b6fe8bafe82db1d64b9cffd42a6ff69 /container-disc
parenta8c76b68336343d25b69dfee3d2b1e93d9c50d80 (diff)
Reapply setup of vespalog in jdisc_core (#22509)
Revert "Merge pull request #22515 from vespa-engine/revert-22509-setup-vespalog-in-jdisc_core"
Diffstat (limited to 'container-disc')
-rw-r--r--container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java5
1 files changed, 2 insertions, 3 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 2c25f38437a..ab764e97fa0 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.LogSetup;
+import com.yahoo.log.impl.InitializeLog;
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 {
- LogSetup.initVespaLogging("Container");
+ InitializeLog.init();
log.log(Level.INFO, "Starting jdisc" + (Vtag.currentVersion.isEmpty() ? "" : " at version " + Vtag.currentVersion));
installBouncyCastleSecurityProvider();
}
@@ -460,7 +460,6 @@ public final class ConfiguredApplication implements Application {
slobrokConfigSubscriber.ifPresent(SlobrokConfigSubscriber::shutdown);
Container.get().shutdown();
unregisterInSlobrok();
- LogSetup.cleanup();
shutdownDeadline.cancel();
log.info("Destroy: Finished");
}