You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2021/03/06 16:07:06 UTC
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new ef774b4 Polished
ef774b4 is described below
commit ef774b4352c1951027207593285fdeee72c743d9
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat Mar 6 17:06:08 2021 +0100
Polished
---
.../camel/impl/engine/AbstractCamelContext.java | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 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 3d2d334..0835060 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
@@ -2963,7 +2963,7 @@ public abstract class AbstractCamelContext extends BaseService
// use basic endpoint uri to not log verbose details or potential sensitive data
String uri = order.getRoute().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));
}
for (Route route : routes) {
if (!route.isAutoStartup()) {
@@ -2977,7 +2977,7 @@ public abstract class AbstractCamelContext extends BaseService
// use basic endpoint uri to not log verbose details or potential sensitive data
String uri = route.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));
}
}
if (disabled > 0) {
@@ -3367,7 +3367,7 @@ public abstract class AbstractCamelContext extends BaseService
// use basic endpoint uri to not log verbose details or potential sensitive data
String uri = order.getRoute().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));
}
if (forced > 0) {
LOG.info("Routes shutdown summary (total:{} stopped:{} forced:{})", total, stopped, forced);
@@ -3542,30 +3542,33 @@ public abstract class AbstractCamelContext extends BaseService
protected void logRouteState(Route route, String state) {
if (LOG.isInfoEnabled()) {
if (route.getConsumer() != null) {
- // use basic endpoint uri to not log verbose details or potential sensitive data
+ String id = route.getId();
String uri = route.getEndpoint().getEndpointBaseUri();
uri = URISupport.sanitizeUri(uri);
- LOG.info("Route: {} is {}, was consuming from: {}", route.getId(), state, uri);
+ String line = String.format("%s %s (%s)", state, id, uri);
+ LOG.info(line);
} else {
- LOG.info("Route: {} is {}.", route.getId(), state);
+ String id = route.getId();
+ String line = String.format("%s %s", state, id);
+ LOG.info(line);
}
}
}
protected synchronized void stopRouteService(RouteService routeService) throws Exception {
routeService.stop();
- logRouteState(routeService.getRoute(), "stopped");
+ logRouteState(routeService.getRoute(), "Stopped");
}
protected synchronized void shutdownRouteService(RouteService routeService) throws Exception {
routeService.shutdown();
- logRouteState(routeService.getRoute(), "shutdown and removed");
+ logRouteState(routeService.getRoute(), "Shutdown");
}
protected synchronized void suspendRouteService(RouteService routeService) throws Exception {
routeService.setRemovingRoutes(false);
routeService.suspend();
- logRouteState(routeService.getRoute(), "suspended");
+ logRouteState(routeService.getRoute(), "Suspended");
}
/**