summaryrefslogtreecommitdiffstats
path: root/jdisc_core
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2022-05-10 00:16:02 +0200
committergjoranv <gjoranv@gmail.com>2022-05-10 22:28:45 +0200
commitbd24d3e48e991443a324b2f2efac3a9b79bdb4f5 (patch)
tree00b6eace4f15498434178f0681bf88399b586b3a /jdisc_core
parent8c340f5dd2b8d17bc83ca660240dfcc9c7a89a7a (diff)
Set up vespalog in StandaloneMain static initializer
- Remove unused InitializeLog
Diffstat (limited to 'jdisc_core')
-rw-r--r--jdisc_core/src/main/java/com/yahoo/jdisc/core/ApplicationLoader.java2
-rw-r--r--jdisc_core/src/main/java/com/yahoo/jdisc/core/StandaloneMain.java2
2 files changed, 2 insertions, 2 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 601a96da24d..e11d31516a4 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,7 +16,6 @@ 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.impl.InitializeLog;
import com.yahoo.log.LogSetup;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
@@ -48,7 +47,6 @@ 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);
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/StandaloneMain.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/StandaloneMain.java
index f3671b5f36d..6c77224c1cd 100644
--- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/StandaloneMain.java
+++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/StandaloneMain.java
@@ -1,6 +1,7 @@
// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.jdisc.core;
+import com.yahoo.log.LogSetup;
import com.yahoo.yolean.system.CatchSignals;
import java.util.Arrays;
@@ -20,6 +21,7 @@ public class StandaloneMain {
static {
// force load slf4j to avoid other logging frameworks from initializing before it
org.slf4j.LoggerFactory.getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME);
+ LogSetup.initVespaLogging("Container");
}
public StandaloneMain() {