This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push: new 7145d01 Reduce logging noise on startup about loaded additional route builders from classpath 7145d01 is described below commit 7145d0186d1ef427d96f60e756073f04db8e5a6b Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Thu Jun 3 08:48:24 2021 +0200 Reduce logging noise on startup about loaded additional route builders from classpath --- .../org/apache/camel/main/DefaultRoutesCollector.java | 2 +- .../java/org/apache/camel/main/RoutesConfigurer.java | 19 +++++++++++++++---- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/core/camel-main/src/main/java/org/apache/camel/main/DefaultRoutesCollector.java b/core/camel-main/src/main/java/org/apache/camel/main/DefaultRoutesCollector.java index 9f80d27..3684825 100644 --- a/core/camel-main/src/main/java/org/apache/camel/main/DefaultRoutesCollector.java +++ b/core/camel-main/src/main/java/org/apache/camel/main/DefaultRoutesCollector.java @@ -173,7 +173,7 @@ public class DefaultRoutesCollector implements RoutesCollector { throw RuntimeCamelException.wrapRuntimeException(e); } if (!answer.isEmpty()) { - log.info("Loaded {} ({} millis) additional RoutesBuilder from: {}, pattern: {}", answer.size(), watch.taken(), + log.debug("Loaded {} ({} millis) additional RoutesBuilder from: {}, pattern: {}", answer.size(), watch.taken(), include, includePattern); } else { diff --git a/core/camel-main/src/main/java/org/apache/camel/main/RoutesConfigurer.java b/core/camel-main/src/main/java/org/apache/camel/main/RoutesConfigurer.java index 904e688..4440dfb 100644 --- a/core/camel-main/src/main/java/org/apache/camel/main/RoutesConfigurer.java +++ b/core/camel-main/src/main/java/org/apache/camel/main/RoutesConfigurer.java @@ -17,6 +17,7 @@ package org.apache.camel.main; import java.util.ArrayList; +import java.util.Collection; import java.util.List; import java.util.Set; @@ -26,6 +27,8 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.RuntimeCamelException; import org.apache.camel.spi.CamelBeanPostProcessor; import org.apache.camel.support.OrderedComparator; +import org.apache.camel.util.StopWatch; +import org.apache.camel.util.TimeUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -166,16 +169,24 @@ public class RoutesConfigurer { LOG.debug("RoutesCollectorEnabled: {}", getRoutesCollector()); // add discovered routes from registry - routes.addAll(getRoutesCollector().collectRoutesFromRegistry( + Collection<RoutesBuilder> routesFromRegistry = getRoutesCollector().collectRoutesFromRegistry( camelContext, getJavaRoutesExcludePattern(), - getJavaRoutesIncludePattern())); + getJavaRoutesIncludePattern()); + routes.addAll(routesFromRegistry); + // add discovered routes from directories - routes.addAll(getRoutesCollector().collectRoutesFromDirectory( + StopWatch watch = new StopWatch(); + Collection<RoutesBuilder> routesFromDirectory = getRoutesCollector().collectRoutesFromDirectory( camelContext, getRoutesExcludePattern(), - getRoutesIncludePattern())); + getRoutesIncludePattern()); + routes.addAll(routesFromDirectory); + if (!routesFromDirectory.isEmpty()) { + LOG.info("Loaded {} additional RoutesBuilder from: {} (took {})", routesFromDirectory.size(), + getRoutesIncludePattern(), TimeUtils.printDuration(watch.taken())); + } } catch (Exception e) { throw RuntimeCamelException.wrapRuntimeException(e); }