Spring/spring-amqp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make ConditionalRejectingErrorHandler extendable

Browse Source 
Make it easier to customize the logging behavior of the default
error handler.

Add protected `log()` method and make `causeChainContainsARADRE()` protected.

**cherry-pick to 2.0.x, 1.7.x**

https://stackoverflow.com/questions/50350377/hide-runtime-exception-in-rabbitmq-listener/50354643#50354643

(cherry picked from commit 3a6176e)

# Conflicts:
#	spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/ConditionalRejectingErrorHandler.java
This commit is contained in:
Gary Russell
2018-05-15 12:24:49 -04:00
committed by Artem Bilan
parent 8e0cd408cf
commit daa78ff3db
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/ConditionalRejectingErrorHandler.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014-2016 the original author or authors.
* Copyright 2014-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -71,19 +71,33 @@ public class ConditionalRejectingErrorHandler implements ErrorHandler {
@Override
public void handleError(Throwable t) {
if (this.logger.isWarnEnabled()) {
this.logger.warn("Execution of Rabbit message listener failed.", t);
}
log(t);
if (!this.causeChainContainsARADRE(t) && this.exceptionStrategy.isFatal(t)) {
throw new AmqpRejectAndDontRequeueException("Error Handler converted exception to fatal", t);
}
}
/**
* Log the throwable at WARN level, including stack trace.
* Subclasses can override this behavior.
* @param t the {@link Throwable}.
* @since 1.7.8
*/
protected void log(Throwable t) {
if (this.logger.isWarnEnabled()) {
this.logger.warn("Execution of Rabbit message listener failed.", t);
}
}
/**
* Return true if there is already an {@link AmqpRejectAndDontRequeueException}
* present in the cause chain.
* @param t a {@link Throwable}.
* @return true if the cause chain already contains an
* {@link AmqpRejectAndDontRequeueException}.
* @since 1.7.8
*/
private boolean causeChainContainsARADRE(Throwable t) {
protected boolean causeChainContainsARADRE(Throwable t) {
Throwable cause = t.getCause();
while (cause != null) {
if (cause instanceof AmqpRejectAndDontRequeueException) {