From e22374242fbd342b4183a6ebcd80f39caed65c88 Mon Sep 17 00:00:00 2001 From: gjoranv Date: Thu, 9 Mar 2023 11:08:26 +0100 Subject: Log installed bundles if and only if this or prev generation have any app bundles. --- .../java/com/yahoo/container/core/config/ApplicationBundleLoader.java | 3 ++- .../java/com/yahoo/container/core/config/HandlersConfigurerDi.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'container-core') 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 66604966c8a..4d97376c102 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 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)); } -- cgit v1.2.3