This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch 3.8.x in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 810fcfe7f215dbc1d0791160781021f9ed7aa996 Author: Benoit Tellier <[email protected]> AuthorDate: Fri Jun 30 21:50:53 2023 +0700 JAMES-3924 Improve dequeuer Lifecycle management --- .../src/main/java/org/apache/james/queue/rabbitmq/Dequeuer.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/Dequeuer.java b/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/Dequeuer.java index 98d2d28b6d..98ed284354 100644 --- a/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/Dequeuer.java +++ b/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/Dequeuer.java @@ -25,6 +25,7 @@ import java.util.function.Consumer; import org.apache.james.backends.rabbitmq.ReceiverProvider; import org.apache.james.blob.api.ObjectNotFoundException; +import org.apache.james.lifecycle.api.LifecycleUtil; import org.apache.james.metrics.api.Metric; import org.apache.james.metrics.api.MetricFactory; import org.apache.james.queue.api.MailQueue; @@ -142,12 +143,15 @@ class Dequeuer { dequeueMetric.increment(); response.ack(); Mono.from(mailQueueView.delete(DeleteCondition.withEnqueueId(mailWithEnqueueId.getEnqueueId(), mailWithEnqueueId.getBlobIds()))).block(); + LifecycleUtil.dispose(mailWithEnqueueId.getMail()); break; case RETRY: response.nack(REQUEUE); + LifecycleUtil.dispose(mailWithEnqueueId.getMail()); break; case REJECT: response.nack(!REQUEUE); + LifecycleUtil.dispose(mailWithEnqueueId.getMail()); break; } }; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
