This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-16757b
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 68d3778779016ed62c729d9c2f00412f12313e03
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Tue Aug 3 09:27:29 2021 +0200
CAMEL-16757: Added DEBUG logging when a route is using route configuration
ids. Added summary logging if verbose level.
---
.../camel/impl/engine/AbstractCamelContext.java | 17 +++++++++++++++
.../engine/DefaultSupervisingRouteController.java | 25 +++++++++++++++++++---
.../org/apache/camel/model/RoutesDefinition.java | 9 ++++++++
3 files changed, 48 insertions(+), 3 deletions(-)
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index 268a5c4..1fbad34 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -2965,6 +2965,7 @@ public abstract class AbstractCamelContext extends
BaseService
int total = 0;
int disabled = 0;
List<String> lines = new ArrayList<>();
+ List<String> configs = new ArrayList<>();
routeStartupOrder.sort(Comparator.comparingInt(RouteStartupOrder::getStartupOrder));
for (RouteStartupOrder order : routeStartupOrder) {
total++;
@@ -2977,6 +2978,11 @@ public abstract class AbstractCamelContext extends
BaseService
String uri =
order.getRoute().getEndpoint().getEndpointBaseUri();
uri = URISupport.sanitizeUri(uri);
lines.add(String.format(" %s %s (%s)", status, id, uri));
+
+ String cid = order.getRoute().getConfigurationId();
+ if (cid != null) {
+ configs.add(String.format(" %s (%s)", id, cid));
+ }
}
for (Route route : routes) {
if (!route.isAutoStartup()) {
@@ -2991,6 +2997,11 @@ public abstract class AbstractCamelContext extends
BaseService
String uri = route.getEndpoint().getEndpointBaseUri();
uri = URISupport.sanitizeUri(uri);
lines.add(String.format(" %s %s (%s)", status, id,
uri));
+
+ String cid = route.getConfigurationId();
+ if (cid != null) {
+ configs.add(String.format(" %s (%s)", id, cid));
+ }
}
}
if (disabled > 0) {
@@ -3003,6 +3014,12 @@ public abstract class AbstractCamelContext extends
BaseService
for (String line : lines) {
LOG.info(line);
}
+ if (startupSummaryLevel == StartupSummaryLevel.Verbose) {
+ LOG.info("Routes configuration summary");
+ for (String line : configs) {
+ LOG.info(line);
+ }
+ }
}
}
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultSupervisingRouteController.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultSupervisingRouteController.java
index ece2f9b..158dbe3 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultSupervisingRouteController.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultSupervisingRouteController.java
@@ -481,6 +481,7 @@ public class DefaultSupervisingRouteController extends
DefaultRouteController im
int restarting = 0;
int exhausted = 0;
List<String> lines = new ArrayList<>();
+ List<String> configs = new ArrayList<>();
for (RouteHolder route : routes) {
String id = route.getId();
String status = getRouteStatus(id).name();
@@ -491,7 +492,11 @@ public class DefaultSupervisingRouteController extends
DefaultRouteController im
// use basic endpoint uri to not log verbose details or
potential sensitive data
String uri = route.get().getEndpoint().getEndpointBaseUri();
uri = URISupport.sanitizeUri(uri);
- lines.add(String.format("\t%s %s (%s)", status, id, uri));
+ lines.add(String.format(" %s %s (%s)", status, id, uri));
+ String cid = route.get().getConfigurationId();
+ if (cid != null) {
+ configs.add(String.format(" %s (%s)", id, cid));
+ }
}
}
for (RouteHolder route : routeManager.routes.keySet()) {
@@ -503,7 +508,11 @@ public class DefaultSupervisingRouteController extends
DefaultRouteController im
String uri = route.get().getEndpoint().getEndpointBaseUri();
uri = URISupport.sanitizeUri(uri);
BackOff backOff = getBackOff(id);
- lines.add(String.format("\t%s %s (%s) with %s", status, id, uri,
backOff));
+ lines.add(String.format(" %s %s (%s) with %s", status, id, uri,
backOff));
+ String cid = route.get().getConfigurationId();
+ if (cid != null) {
+ configs.add(String.format(" %s (%s)", id, cid));
+ }
}
for (RouteHolder route : routeManager.exhausted.keySet()) {
total++;
@@ -513,7 +522,11 @@ public class DefaultSupervisingRouteController extends
DefaultRouteController im
// use basic endpoint uri to not log verbose details or potential
sensitive data
String uri = route.get().getEndpoint().getEndpointBaseUri();
uri = URISupport.sanitizeUri(uri);
- lines.add(String.format("\t%s %s (%s)", status, id, uri));
+ lines.add(String.format(" %s %s (%s)", status, id, uri));
+ String cid = route.get().getConfigurationId();
+ if (cid != null) {
+ configs.add(String.format(" %s (%s)", id, cid));
+ }
}
if (restarting == 0 && exhausted == 0) {
@@ -527,6 +540,12 @@ public class DefaultSupervisingRouteController extends
DefaultRouteController im
for (String line : lines) {
LOG.info(line);
}
+ if (getCamelContext().getStartupSummaryLevel() ==
StartupSummaryLevel.Verbose) {
+ LOG.info("Routes configuration summary");
+ for (String line : configs) {
+ LOG.info(line);
+ }
+ }
}
}
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/RoutesDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/RoutesDefinition.java
index 4151ff0..f978ab4 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/RoutesDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/RoutesDefinition.java
@@ -33,6 +33,8 @@ import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.spi.AsEndpointUri;
import org.apache.camel.spi.Metadata;
import org.apache.camel.support.PatternHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A series of Camel routes
@@ -42,6 +44,9 @@ import org.apache.camel.support.PatternHelper;
@XmlAccessorType(XmlAccessType.FIELD)
public class RoutesDefinition extends
OptionalIdentifiedDefinition<RoutesDefinition>
implements RouteContainer, CamelContextAware {
+
+ private static final Logger LOG =
LoggerFactory.getLogger(RoutesDefinition.class);
+
@XmlElementRef
private List<RouteDefinition> routes = new ArrayList<>();
@XmlTransient
@@ -241,6 +246,10 @@ public class RoutesDefinition extends
OptionalIdentifiedDefinition<RoutesDefinit
// must prepare the route before we can add it to the routes list
RouteDefinitionHelper.prepareRoute(getCamelContext(), route, oe, icp,
ifrom, ito, oc);
+ if (LOG.isDebugEnabled() && route.getRouteConfigurationId() != null) {
+ LOG.debug("Route: {} is using routeConfigurationsId: {}",
route.getId(), route.getRouteConfigurationId());
+ }
+
// mark this route as prepared
route.markPrepared();
}
