This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit a9eaacb008689223f7fa60f6e0ac7e222a81a5c3 Author: Rene Cordier <[email protected]> AuthorDate: Wed Mar 13 11:05:38 2019 +0700 JAMES-2666 Remove a duplicated used method in RabbitMQ GroupHandler --- .../java/org/apache/james/mailbox/events/GroupConsumerRetry.java | 6 +----- .../java/org/apache/james/mailbox/events/GroupRegistration.java | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/mailbox/events/GroupConsumerRetry.java b/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/mailbox/events/GroupConsumerRetry.java index 9fdd440..54a78ca 100644 --- a/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/mailbox/events/GroupConsumerRetry.java +++ b/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/mailbox/events/GroupConsumerRetry.java @@ -100,14 +100,10 @@ class GroupConsumerRetry { Mono<Void> handleRetry(Event event, int currentRetryCount, Throwable throwable) { createStructuredLogger(event).log(logger -> logger.error("Exception happens when handling event after {} retries", currentRetryCount, throwable)); - return handleRetry(event, currentRetryCount); - } - - Mono<Void> handleRetry(Event event, int currentRetryCount) { return retryOrStoreToDeadLetter(event, currentRetryCount); } - private Mono<Void> retryOrStoreToDeadLetter(Event event, int currentRetryCount) { + Mono<Void> retryOrStoreToDeadLetter(Event event, int currentRetryCount) { if (currentRetryCount >= retryBackoff.getMaxRetries()) { return eventDeadLetters.store(group, event, EventDeadLetters.InsertionId.random()); } diff --git a/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/mailbox/events/GroupRegistration.java b/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/mailbox/events/GroupRegistration.java index d527699..985da0a 100644 --- a/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/mailbox/events/GroupRegistration.java +++ b/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/mailbox/events/GroupRegistration.java @@ -148,7 +148,7 @@ class GroupRegistration implements Registration { } Mono<Void> reDeliver(Event event) { - return retryHandler.handleRetry(event, DEFAULT_RETRY_COUNT); + return retryHandler.retryOrStoreToDeadLetter(event, DEFAULT_RETRY_COUNT); } private void runListener(Event event) throws Exception { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
