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

AMQP-155: add throwable

Browse Source
This commit is contained in:
Dave Syer
2011-04-08 13:34:56 +01:00
parent b49a54dd84
commit 8f8291fe92
4 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-rabbit/src/main/java/org/springframework/amqp/rabbit/config/StatefulRetryOperationsInterceptorFactoryBean.java
View File

@@ -84,9 +84,9 @@ public class StatefulRetryOperationsInterceptorFactoryBean extends AbstractRetry
public Void recover(Object[] args, Throwable cause) {
Message message = (Message) args[1];
if (messageRecoverer == null) {
logger.warn("Message dropped on recovery: " + message);
logger.warn("Message dropped on recovery: " + message, cause);
} else {
messageRecoverer.recover(message);
messageRecoverer.recover(message, cause);
}
return null;
}

22
spring-rabbit/src/main/java/org/springframework/amqp/rabbit/config/StatelessRetryOperationsInterceptorFactoryBean.java
View File

@@ -12,6 +12,8 @@
*/
package org.springframework.amqp.rabbit.config;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.amqp.core.Message;
import org.springframework.amqp.rabbit.retry.MessageRecoverer;
import org.springframework.retry.RetryOperations;
@@ -36,6 +38,8 @@ import org.springframework.retry.support.RetryTemplate;
*/
public class StatelessRetryOperationsInterceptorFactoryBean extends AbstractRetryOperationsInterceptorFactoryBean {
private static Log logger = LogFactory.getLog(StatelessRetryOperationsInterceptorFactoryBean.class);
public RetryOperationsInterceptor getObject() {
RetryOperationsInterceptor retryInterceptor = new RetryOperationsInterceptor();
@@ -46,15 +50,17 @@ public class StatelessRetryOperationsInterceptorFactoryBean extends AbstractRetr
retryInterceptor.setRetryOperations(retryTemplate);
final MessageRecoverer messageRecoverer = getMessageRecoverer();
if (messageRecoverer != null) {
retryInterceptor.setRecoverer(new MethodInvocationRecoverer<Void>() {
public Void recover(Object[] args, Throwable cause) {
Message message = (Message) args[1];
messageRecoverer.recover(message);
return null;
retryInterceptor.setRecoverer(new MethodInvocationRecoverer<Void>() {
public Void recover(Object[] args, Throwable cause) {
Message message = (Message) args[1];
if (messageRecoverer == null) {
logger.warn("Message dropped on recovery: " + message, cause);
} else {
messageRecoverer.recover(message, cause);
}
});
}
return null;
}
});
return retryInterceptor;

3
spring-rabbit/src/main/java/org/springframework/amqp/rabbit/retry/MessageRecoverer.java
View File

@@ -24,7 +24,8 @@ public interface MessageRecoverer {
* Callback for message that was consumed but failed all retry attempts.
*
* @param message the message to recover
* @param cause the cause of the error
*/
void recover(Message message);
void recover(Message message, Throwable cause);
}

2
spring-rabbit/src/test/java/org/springframework/amqp/rabbit/listener/MessageListenerContainerRetryIntegrationTests.java
View File

@@ -143,7 +143,7 @@ public class MessageListenerContainerRetryIntegrationTests {
factory = new StatelessRetryOperationsInterceptorFactoryBean();
}
factory.setMessageRecoverer(new MessageRecoverer() {
public void recover(Message message) {
public void recover(Message message, Throwable cause) {
logger.info("Recovered: " + message);
latch.countDown();
}