CAMEL-7050: DeadLetterChannel should make more clear that it handles any new exception also. Added option to configure this behavior so ppl can turn that off and let new exceptions be unhandled, so transactions can rollback.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/296c5af2 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/296c5af2 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/296c5af2 Branch: refs/heads/master Commit: 296c5af2eaffef9d7bc6a39dd0dd7e226ca05b09 Parents: 27136c3 Author: Claus Ibsen <[email protected]> Authored: Sun Jan 18 14:19:28 2015 +0100 Committer: Claus Ibsen <[email protected]> Committed: Sun Jan 18 14:19:28 2015 +0100 ---------------------------------------------------------------------- .../builder/DefaultErrorHandlerBuilder.java | 5 +++++ .../camel/processor/RedeliveryErrorHandler.java | 19 +++++++++++++++---- ...terChannelHandlerRollbackOnExceptionTest.java | 3 ++- 3 files changed, 22 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/296c5af2/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java index d57f110..417728d 100644 --- a/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java +++ b/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java @@ -191,6 +191,11 @@ public class DefaultErrorHandlerBuilder extends ErrorHandlerBuilderSupport { return this; } + public DefaultErrorHandlerBuilder logNewException(boolean logNewException) { + getRedeliveryPolicy().setLogNewException(logNewException); + return this; + } + public DefaultErrorHandlerBuilder logExhausted(boolean logExhausted) { getRedeliveryPolicy().setLogExhausted(logExhausted); return this; http://git-wip-us.apache.org/repos/asf/camel/blob/296c5af2/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java b/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java index 9120221..c50c87c 100644 --- a/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java +++ b/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java @@ -928,6 +928,9 @@ public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport impleme final boolean isDeadLetterChannel, final boolean shouldHandle, final boolean shouldContinue) { Exception newException = exchange.getException(); + if (newException != null && data.currentRedeliveryPolicy.isLogNewException()) { + logFailedDelivery(false, true, false, false, exchange, null, data, newException); + } // we could not process the exchange so we let the failure processor handled it ExchangeHelper.setFailureHandled(exchange); @@ -935,9 +938,7 @@ public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport impleme if (isDeadLetterChannel && shouldHandle) { if (data.handleNewException) { // if there is a new exception then log a warning about that - String msg = "DeadLetterChannel failed processing exchange due new exception: " + newException.getMessage() - + ". This new exception is handled and ignored. The option deadLetterChannelHandleNewException can be turned off to not handle new exceptions"; - logFailedDelivery(false, true, false, false, exchange, msg, data, newException); + log.trace("This exchange is handled so its marked as not failed: {}", exchange); } else { // exception not handled, put exception back in the exchange exchange.setException(exchange.getProperty(Exchange.EXCEPTION_CAUGHT, Exception.class)); @@ -1033,8 +1034,17 @@ public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport impleme } if (newException) { + // log at most WARN level + if (newLogLevel == LoggingLevel.ERROR) { + newLogLevel = LoggingLevel.WARN; + } // special for logging the new exception - String msg = message + " " + ExchangeHelper.logIds(exchange); + String msg = "New exception " + ExchangeHelper.logIds(exchange); + Throwable cause = exchange.getException() != null ? exchange.getException() : exchange.getProperty(Exchange.EXCEPTION_CAUGHT, Throwable.class); + if (cause != null) { + msg = msg + " due: " + cause.getMessage(); + } + if (e != null && logStackTrace) { logger.log(msg, e, newLogLevel); } else { @@ -1047,6 +1057,7 @@ public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport impleme msg = msg + " due: " + cause.getMessage(); } + // should we include message history if (!shouldRedeliver && data.currentRedeliveryPolicy.isLogExhaustedMessageHistory()) { String routeStackTrace = MessageHelper.dumpMessageHistoryStacktrace(exchange, exchangeFormatter, false); http://git-wip-us.apache.org/repos/asf/camel/blob/296c5af2/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsTransactedDeadLetterChannelHandlerRollbackOnExceptionTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsTransactedDeadLetterChannelHandlerRollbackOnExceptionTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsTransactedDeadLetterChannelHandlerRollbackOnExceptionTest.java index 9052144..7dd8382 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsTransactedDeadLetterChannelHandlerRollbackOnExceptionTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsTransactedDeadLetterChannelHandlerRollbackOnExceptionTest.java @@ -52,7 +52,8 @@ public class JmsTransactedDeadLetterChannelHandlerRollbackOnExceptionTest extend // we use DLC to handle the exception but if it throw a new exception // then the DLC handles that too (the transaction will always commit) errorHandler(deadLetterChannel("bean:" + BadErrorHandler.class.getName()) - .deadLetterHandleNewException(isHandleNew())); + .deadLetterHandleNewException(isHandleNew()) + .logNewException(true)); from(testingEndpoint) .log("Incoming JMS message ${body}")
