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 94acf887660c CAMEL-23122: camel-core - DefaultErrorHandler with
logExhausted(false) still logs (#21688)
94acf887660c is described below
commit 94acf887660c044577972370dbd5cccedd5be002
Author: Claus Ibsen <[email protected]>
AuthorDate: Tue Mar 3 10:46:35 2026 +0100
CAMEL-23122: camel-core - DefaultErrorHandler with logExhausted(false)
still logs (#21688)
---
.../errorhandler/RedeliveryErrorHandler.java | 12 ++-
.../DefaultErrorHandlerLogExhaustedFalseTest.java | 105 +++++++++++++++++++++
2 files changed, 112 insertions(+), 5 deletions(-)
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryErrorHandler.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryErrorHandler.java
index bdd5209266e1..63693b60dd37 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryErrorHandler.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryErrorHandler.java
@@ -891,12 +891,14 @@ public abstract class RedeliveryErrorHandler extends
ErrorHandlerSupport
exchange.setProperty(ExchangePropertyKey.FAILURE_ROUTE_ID,
rc.getRouteId());
}
- // create log message
- String msg = "Failed delivery for " +
ExchangeHelper.logIds(exchange);
- msg = msg + ". Exhausted after delivery attempt: 1 caught: " +
exchange.getException();
+ if (redeliveryPolicy.isLogExhausted()) {
+ // create log message
+ String msg = "Failed delivery for " +
ExchangeHelper.logIds(exchange);
+ msg = msg + ". Exhausted after delivery attempt: 1 caught: " +
exchange.getException();
- // log that we failed delivery as we are exhausted
- logFailedDelivery(exchange, msg, null);
+ // log that we failed delivery as we are exhausted
+ logFailedDelivery(exchange, msg, null);
+ }
}
private void logFailedDelivery(Exchange exchange, String message,
Throwable e) {
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/DefaultErrorHandlerLogExhaustedFalseTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/DefaultErrorHandlerLogExhaustedFalseTest.java
new file mode 100644
index 000000000000..d93596168426
--- /dev/null
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/DefaultErrorHandlerLogExhaustedFalseTest.java
@@ -0,0 +1,105 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.processor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.RoutesBuilder;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.spi.CamelLogger;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
+public class DefaultErrorHandlerLogExhaustedFalseTest extends
ContextTestSupport {
+
+ private final MyLogger logger = new MyLogger();
+
+ @Override
+ public boolean isUseRouteBuilder() {
+ return false;
+ }
+
+ @Test
+ public void testLogExhaustedFalse() throws Exception {
+ context.addRoutes(createRouteBuilder(false));
+ context.start();
+
+ logger.getLines().clear();
+ try {
+ template.sendBody("direct:start", "Hello World");
+ fail();
+ } catch (Exception e) {
+ assertIsInstanceOf(IllegalArgumentException.class, e.getCause());
+ assertEquals("Forced", e.getCause().getMessage());
+ }
+ Assertions.assertEquals(0, logger.getLines().size());
+ }
+
+ @Test
+ public void testLogExhaustedTrue() throws Exception {
+ context.addRoutes(createRouteBuilder(true));
+ context.start();
+
+ logger.getLines().clear();
+ try {
+ template.sendBody("direct:start", "Hello World");
+ fail();
+ } catch (Exception e) {
+ assertIsInstanceOf(IllegalArgumentException.class, e.getCause());
+ assertEquals("Forced", e.getCause().getMessage());
+ }
+ Assertions.assertEquals(1, logger.getLines().size());
+ Assertions.assertTrue(logger.getLines().get(0).startsWith("Failed
delivery"));
+ }
+
+ protected RoutesBuilder createRouteBuilder(boolean logExhausted) throws
Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ errorHandler(defaultErrorHandler()
+ .logger(logger)
+ .logExhausted(logExhausted)
+ .logStackTrace(false)
+ .logExhaustedMessageBody(false)
+ .logExhaustedMessageHistory(false));
+
+ from("direct:start")
+ .throwException(new
IllegalArgumentException("Forced"));
+ }
+ };
+ }
+
+ private static class MyLogger extends CamelLogger {
+
+ private final List<String> lines = new ArrayList<>();
+
+ @Override
+ public void log(String message) {
+ lines.add(message);
+ super.log(message);
+ }
+
+ public List<String> getLines() {
+ return lines;
+ }
+ }
+}
