diff options
| author | gjoranv <gv@verizonmedia.com> | 2022-05-10 14:00:08 +0200 |
|---|---|---|
| committer | gjoranv <gjoranv@gmail.com> | 2022-05-10 22:28:45 +0200 |
| commit | 20bb0b703f97226f7866565478a6df34f9769467 (patch) | |
| tree | caa6cbf345b20e9a7fbdf5c5e6204932301c53ab /jdisc_core | |
| parent | 4e63c554b741a0552c594d2738679502229e8658 (diff) | |
Set up logging in ApplicationLoader again.
- If done in StandaloneMain, logging will not work in integration
tests (using TestDriver) or test frameworks (e.g. application).
Diffstat (limited to 'jdisc_core')
| -rw-r--r-- | jdisc_core/src/main/java/com/yahoo/jdisc/core/ApplicationLoader.java | 1 | ||||
| -rw-r--r-- | jdisc_core/src/main/java/com/yahoo/jdisc/core/StandaloneMain.java | 1 |
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() { |