From 47bf32ccfc5abfc221fef8d9af237699174bbb5b Mon Sep 17 00:00:00 2001 From: Håkon Hallingstad Date: Fri, 24 Sep 2021 15:06:59 +0200 Subject: Log Vespa version when jDisc starts --- .../src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 853224a5b91..f3dcff41488 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 @@ -5,6 +5,7 @@ import com.google.inject.AbstractModule; import com.google.inject.Inject; import com.google.inject.Injector; import com.yahoo.cloud.config.SlobroksConfig; +import com.yahoo.component.Vtag; import com.yahoo.component.provider.ComponentRegistry; import com.yahoo.concurrent.DaemonThreadFactory; import com.yahoo.config.ConfigInstance; @@ -99,7 +100,7 @@ public final class ConfiguredApplication implements Application { static { LogSetup.initVespaLogging("Container"); - log.log(Level.INFO, "Starting container"); + log.log(Level.INFO, "Starting container" + (Vtag.currentVersion.isEmpty() ? "" : " at version " + Vtag.currentVersion)); } /** -- cgit v1.2.3 From c569b6b38b234dd1d2dbd6015b6d36bad33b8bef Mon Sep 17 00:00:00 2001 From: Håkon Hallingstad Date: Fri, 24 Sep 2021 15:39:42 +0200 Subject: Avoid the overloaded "container" name --- .../src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f3dcff41488..3dd709685b2 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 @@ -100,7 +100,7 @@ public final class ConfiguredApplication implements Application { static { LogSetup.initVespaLogging("Container"); - log.log(Level.INFO, "Starting container" + (Vtag.currentVersion.isEmpty() ? "" : " at version " + Vtag.currentVersion)); + log.log(Level.INFO, "Starting jdisc" + (Vtag.currentVersion.isEmpty() ? "" : " at version " + Vtag.currentVersion)); } /** -- cgit v1.2.3