You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ro...@apache.org on 2019/10/18 06:40:48 UTC
[james-project] 15/17: JAMES-2813 delete rabbitmq queue after each
test on distributed task manager
This is an automated email from the ASF dual-hosted git repository.
rouazana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit eb5f1be73c0806d7298315b4c247a45e2484463f
Author: Rémi KOWALSKI <rk...@linagora.com>
AuthorDate: Tue Oct 15 16:17:26 2019 +0200
JAMES-2813 delete rabbitmq queue after each test on distributed task manager
---
.../java/org/apache/james/backends/rabbitmq/RabbitMQExtension.java | 4 ++--
.../james/task/eventsourcing/distributed/RabbitMQWorkQueue.java | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/backends-common/rabbitmq/src/test/java/org/apache/james/backends/rabbitmq/RabbitMQExtension.java b/backends-common/rabbitmq/src/test/java/org/apache/james/backends/rabbitmq/RabbitMQExtension.java
index 577be12..668b808 100644
--- a/backends-common/rabbitmq/src/test/java/org/apache/james/backends/rabbitmq/RabbitMQExtension.java
+++ b/backends-common/rabbitmq/src/test/java/org/apache/james/backends/rabbitmq/RabbitMQExtension.java
@@ -118,10 +118,10 @@ public class RabbitMQExtension implements BeforeAllCallback, BeforeEachCallback,
}
@Override
- public void afterEach(ExtensionContext context) {
+ public void afterEach(ExtensionContext context) throws Exception {
simpleChannelPool.close();
connectionPool.close();
-
+ rabbitMQ.reset();
dockerRestartPolicy.afterEach(rabbitMQ);
}
diff --git a/server/task/task-distributed/src/main/java/org/apache/james/task/eventsourcing/distributed/RabbitMQWorkQueue.java b/server/task/task-distributed/src/main/java/org/apache/james/task/eventsourcing/distributed/RabbitMQWorkQueue.java
index e736798..21a9880 100644
--- a/server/task/task-distributed/src/main/java/org/apache/james/task/eventsourcing/distributed/RabbitMQWorkQueue.java
+++ b/server/task/task-distributed/src/main/java/org/apache/james/task/eventsourcing/distributed/RabbitMQWorkQueue.java
@@ -203,6 +203,7 @@ public class RabbitMQWorkQueue implements WorkQueue, Startable {
public void close() {
Optional.ofNullable(receiverHandle).ifPresent(Disposable::dispose);
Optional.ofNullable(receiver).ifPresent(RabbitMQExclusiveConsumer::close);
+ Optional.ofNullable(sender).ifPresent(Sender::close);
Optional.ofNullable(sendCancelRequestsQueueHandle).ifPresent(Disposable::dispose);
Optional.ofNullable(cancelRequestListenerHandle).ifPresent(Disposable::dispose);
Optional.ofNullable(sender).ifPresent(Sender::close);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org