summaryrefslogtreecommitdiffstats
path: root/jdisc_core/src/main/java/com/yahoo/jdisc/core
diff options
context:
space:
mode:
Diffstat (limited to 'jdisc_core/src/main/java/com/yahoo/jdisc/core')
-rw-r--r--jdisc_core/src/main/java/com/yahoo/jdisc/core/ApplicationLoader.java1
-rw-r--r--jdisc_core/src/main/java/com/yahoo/jdisc/core/StandaloneMain.java1
2 files changed, 1 insertions, 1 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 e11d31516a4..dc6ee180321 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
@@ -47,6 +47,7 @@ public class ApplicationLoader implements BootstrapLoader, ContainerActivator, C
private ApplicationInUseTracker applicationInUseTracker;
public ApplicationLoader(OsgiFramework osgiFramework, Iterable<? extends Module> guiceModules) {
+ LogSetup.initVespaLogging("Container");
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 6c77224c1cd..5301fecd2f0 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
@@ -21,7 +21,6 @@ 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() {