summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHåkon Hallingstad <hakon@oath.com>2017-12-23 15:32:40 +0100
committerHåkon Hallingstad <hakon@oath.com>2017-12-23 15:32:40 +0100
commitb2118a8c096d506764d79bc8b7e36209781eecd0 (patch)
treef4ea27962f584c20b79aa231185cfaf3c9f06031
parentde3346c2f4c42e439027400ad37c0871cab61c40 (diff)
Move initial log to right after Vespa logging has been initialized
-rw-r--r--container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java2
-rw-r--r--jdisc_core/src/main/java/com/yahoo/jdisc/core/StandaloneMain.java3
2 files changed, 4 insertions, 1 deletions
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 fa2ee8e89a9..bf696771b20 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
@@ -29,6 +29,7 @@ import com.yahoo.jdisc.handler.RequestHandler;
import com.yahoo.jdisc.service.ClientProvider;
import com.yahoo.jdisc.service.ServerProvider;
import com.yahoo.jrt.ListenFailedException;
+import com.yahoo.log.LogLevel;
import com.yahoo.log.LogSetup;
import com.yahoo.osgi.OsgiImpl;
import com.yahoo.vespa.config.ConfigKey;
@@ -88,6 +89,7 @@ public final class ConfiguredApplication implements Application {
static {
LogSetup.initVespaLogging("Container");
+ log.log(LogLevel.INFO, "Starting container");
}
/**
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 b0146cd88d3..07ca91f9396 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
@@ -36,8 +36,9 @@ public class StandaloneMain {
void run(String bundleLocation) {
try {
+ // We're not logging at this point since the application is responsible
+ // for setting up logging.
System.out.println("debug\tInitializing application without privileges.");
- log.log(Level.INFO, "JDisc starting with bundle location " + bundleLocation);
loader.init(bundleLocation, false);
loader.start();
setupSigTermHandler();