Initialize logging earlier in container startup sequence

1 files changed, 4 insertions, 0 deletions

diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/ApplicationLoader.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/ApplicationLoader.java
index 952e8dd5f00..4ccec132ccc 100644
--- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/ApplicationLoader.java
+++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/ApplicationLoader.java
@@ -16,6 +16,8 @@ import com.yahoo.jdisc.application.OsgiHeader;
 import com.yahoo.jdisc.service.ContainerNotReadyException;
 import com.yahoo.jdisc.service.CurrentContainer;
 import com.yahoo.jdisc.statistics.ContainerWatchdogMetrics;
+import com.yahoo.log.InitializeLog;
+import com.yahoo.log.LogSetup;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleException;
@@ -46,6 +48,7 @@ public class ApplicationLoader implements BootstrapLoader, ContainerActivator, C
     private ApplicationInUseTracker applicationInUseTracker;
 
     public ApplicationLoader(OsgiFramework osgiFramework, Iterable<? extends Module> guiceModules) {
+        InitializeLog.init();
         this.osgiFramework = osgiFramework;
         this.guiceModules.install(new ApplicationEnvironmentModule(this));
         this.guiceModules.installAll(guiceModules);
@@ -198,6 +201,7 @@ public class ApplicationLoader implements BootstrapLoader, ContainerActivator, C
         try {
             watchdog.close();
             osgiFramework.stop();
+            LogSetup.cleanup();
         } catch (BundleException | InterruptedException e) {
             e.printStackTrace();
         }