diff options
author | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2023-03-09 11:46:41 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-09 11:46:41 +0100 |
commit | c9d811555d9e0587950cbed25dac2d7469dec2f3 (patch) | |
tree | a8933860b4ec661c8854bae66b59aca96e4f9297 /container-core/src/main/java/com/yahoo/container | |
parent | 3ba641ac2acf91d7b9762df5955f504d3eeaa27e (diff) | |
parent | e22374242fbd342b4183a6ebcd80f39caed65c88 (diff) |
Merge pull request #26378 from vespa-engine/log-adjustments
Log installed bundles if and only if this or prev generation have any…
Diffstat (limited to 'container-core/src/main/java/com/yahoo/container')
-rw-r--r-- | container-core/src/main/java/com/yahoo/container/core/config/ApplicationBundleLoader.java | 3 | ||||
-rw-r--r-- | container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/core/config/ApplicationBundleLoader.java b/container-core/src/main/java/com/yahoo/container/core/config/ApplicationBundleLoader.java index ed9eb229074..211008675ef 100644 --- a/container-core/src/main/java/com/yahoo/container/core/config/ApplicationBundleLoader.java +++ b/container-core/src/main/java/com/yahoo/container/core/config/ApplicationBundleLoader.java @@ -70,7 +70,8 @@ public class ApplicationBundleLoader { bundlesFromNewGeneration = installBundles(newFileReferences); BundleStarter.startBundles(activeBundles.values()); - log.fine(installedBundlesMessage()); + + if (! (obsoleteBundles.isEmpty() && newFileReferences.isEmpty())) log.info(installedBundlesMessage()); readyForNewBundles = false; } diff --git a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java index 06dce96e70a..925ea9ec702 100644 --- a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java +++ b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java @@ -15,8 +15,8 @@ import com.yahoo.container.di.componentgraph.core.ComponentGraph; import com.yahoo.container.di.config.SubscriberFactory; import com.yahoo.container.logging.AccessLog; import com.yahoo.filedistribution.fileacquirer.FileAcquirer; -import com.yahoo.jdisc.application.OsgiFramework; import com.yahoo.jdisc.application.BsnVersion; +import com.yahoo.jdisc.application.OsgiFramework; import com.yahoo.jdisc.handler.RequestHandler; import com.yahoo.jdisc.service.ClientProvider; import com.yahoo.jdisc.service.ServerProvider; @@ -104,7 +104,7 @@ public class HandlersConfigurerDi { @Override public void useApplicationBundles(Collection<FileReference> bundles, long generation) { - log.info("Installing bundles for application generation " + generation); + if (! bundles.isEmpty()) log.info("Installing bundles for application generation " + generation); applicationBundleLoader.useBundles(new ArrayList<>(bundles)); } |