From f258b373610cad2743c12d723968621265012e25 Mon Sep 17 00:00:00 2001
From: gjoranv <gv@verizonmedia.com>
Date: Mon, 9 May 2022 17:57:24 +0200
Subject: Reapply setup of vespalog in jdisc_core (#22509)

Revert "Merge pull request #22515 from vespa-engine/revert-22509-setup-vespalog-in-jdisc_core"
---
 .../main/java/com/yahoo/container/jdisc/ConfiguredApplication.java   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'container-disc/src')

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");
     }
-- 
cgit v1.2.3