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 2022/01/15 17:08:49 UTC
[camel] branch main updated: CAMEL-17496: polish exchange events toString output for nicer tracing output.
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 a8dd2c5 CAMEL-17496: polish exchange events toString output for nicer tracing output.
a8dd2c5 is described below
commit a8dd2c5bee10e644512923a0b2205c7c7918d3cc
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat Jan 15 17:13:49 2022 +0100
CAMEL-17496: polish exchange events toString output for nicer tracing output.
---
.../java/org/apache/camel/impl/event/ExchangeCompletedEvent.java | 2 +-
.../java/org/apache/camel/impl/event/ExchangeCreatedEvent.java | 2 +-
.../java/org/apache/camel/impl/event/ExchangeFailedEvent.java | 4 ++--
.../org/apache/camel/impl/event/ExchangeFailureHandledEvent.java | 8 ++++----
.../org/apache/camel/impl/event/ExchangeFailureHandlingEvent.java | 8 ++++----
.../java/org/apache/camel/impl/event/ExchangeRedeliveryEvent.java | 5 ++---
.../java/org/apache/camel/impl/event/ExchangeSendingEvent.java | 2 +-
.../main/java/org/apache/camel/impl/event/ExchangeSentEvent.java | 5 +++--
8 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeCompletedEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeCompletedEvent.java
index eb34246..172c949 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeCompletedEvent.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeCompletedEvent.java
@@ -28,6 +28,6 @@ public class ExchangeCompletedEvent extends AbstractExchangeEvent implements Cam
@Override
public String toString() {
- return getExchange().getExchangeId() + " exchange completed: " + getExchange();
+ return getExchange().getExchangeId() + " exchange completed";
}
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeCreatedEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeCreatedEvent.java
index 625b4e5..02a3dbe 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeCreatedEvent.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeCreatedEvent.java
@@ -34,6 +34,6 @@ public class ExchangeCreatedEvent extends AbstractExchangeEvent implements Camel
@Override
public String toString() {
- return getExchange().getExchangeId() + " exchange created: " + getExchange();
+ return getExchange().getExchangeId() + " exchange created";
}
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailedEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailedEvent.java
index 8c74a21..1d4d811 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailedEvent.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailedEvent.java
@@ -35,9 +35,9 @@ public class ExchangeFailedEvent extends AbstractExchangeEvent implements CamelE
public String toString() {
Exception cause = getExchange().getException();
if (cause != null) {
- return getExchange().getExchangeId() + " exchange failure: " + getExchange() + " cause " + cause;
+ return getExchange().getExchangeId() + " exchange failed due to: " + cause;
} else {
- return getExchange().getExchangeId() + " exchange failure: " + getExchange();
+ return getExchange().getExchangeId() + " exchange failed";
}
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailureHandledEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailureHandledEvent.java
index 9bd4bb8..b7442de 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailureHandledEvent.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailureHandledEvent.java
@@ -67,11 +67,11 @@ public class ExchangeFailureHandledEvent extends AbstractExchangeEvent implement
public String toString() {
if (isDeadLetterChannel()) {
String uri = URISupport.sanitizeUri(deadLetterUri);
- return getExchange().getExchangeId() + " exchange failed: " + getExchange()
- + " but was handled by dead letter channel: " + uri;
+ return getExchange().getExchangeId() + " exchange failed"
+ + " and sent to dead letter channel: " + uri;
} else {
- return getExchange().getExchangeId() + " exchange failed: " + getExchange()
- + " but was processed by failure processor: " + failureHandler;
+ return getExchange().getExchangeId() + " exchange failed"
+ + " and sent to processor: " + failureHandler;
}
}
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailureHandlingEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailureHandlingEvent.java
index 39ee3b6..a028ff9 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailureHandlingEvent.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailureHandlingEvent.java
@@ -55,11 +55,11 @@ public class ExchangeFailureHandlingEvent extends AbstractExchangeEvent implemen
public String toString() {
if (isDeadLetterChannel()) {
String uri = URISupport.sanitizeUri(deadLetterUri);
- return getExchange().getExchangeId() + " exchange failed: " + getExchange()
- + " but is being handled by dead letter channel: " + uri;
+ return getExchange().getExchangeId() + " exchange failed"
+ + " and sending to dead letter channel: " + uri;
} else {
- return getExchange().getExchangeId() + " exchange failed: " + getExchange()
- + " but is being processed by failure processor: " + failureHandler;
+ return getExchange().getExchangeId() + " exchange failed"
+ + " and sending to processor: " + failureHandler;
}
}
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeRedeliveryEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeRedeliveryEvent.java
index deb8b02..49bfd30 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeRedeliveryEvent.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeRedeliveryEvent.java
@@ -38,10 +38,9 @@ public class ExchangeRedeliveryEvent extends AbstractExchangeEvent implements Ca
public String toString() {
Exception cause = getExchange().getProperty(Exchange.EXCEPTION_CAUGHT, Exception.class);
if (cause != null) {
- return getExchange().getExchangeId() + " exchange redelivery: " + getExchange() + " attempt " + attempt + " cause "
- + cause;
+ return getExchange().getExchangeId() + " retrying attempt " + attempt + " due to " + cause;
} else {
- return getExchange().getExchangeId() + " exchange redelivery: " + getExchange() + " attempt " + attempt;
+ return getExchange().getExchangeId() + " retrying attempt " + attempt;
}
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeSendingEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeSendingEvent.java
index 41b225e..949dbbe 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeSendingEvent.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeSendingEvent.java
@@ -52,7 +52,7 @@ public class ExchangeSendingEvent extends AbstractExchangeEvent implements Camel
@Override
public String toString() {
- return getExchange().getExchangeId() + " exchange " + getExchange() + " sending to: " + endpoint;
+ return getExchange().getExchangeId() + " exchange sending to: " + endpoint;
}
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeSentEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeSentEvent.java
index b68ece1..546d7a1 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeSentEvent.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeSentEvent.java
@@ -19,6 +19,7 @@ package org.apache.camel.impl.event;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.spi.CamelEvent;
+import org.apache.camel.util.TimeUtils;
/**
* Event for <b>after</b> an {@link Exchange} has been sent to an {@link Endpoint}. The {@link ExchangeSentEvent} is an
@@ -54,8 +55,8 @@ public class ExchangeSentEvent extends AbstractExchangeEvent implements CamelEve
@Override
public String toString() {
- return getExchange().getExchangeId() + " exchange " + getExchange() + " sent to: " + endpoint + " took: " + timeTaken
- + " ms.";
+ return getExchange().getExchangeId() + " exchange sent to: " + endpoint
+ + " took: " + TimeUtils.printDuration(timeTaken);
}
}