This is an automated email from the ASF dual-hosted git repository. rcordier pushed a commit to branch postgresql in repository https://gitbox.apache.org/repos/asf/james-project.git
commit f1c144d32831b122be7378872fcc8e142052b82e Author: Quan Tran <[email protected]> AuthorDate: Mon Apr 1 15:56:53 2024 +0700 JAMES-2586 Do not use ActiveMQ mail queue when distributed mode Use RabbitMQ mail queue instead. --- .../main/java/org/apache/james/PostgresJamesServerMain.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/server/apps/postgres-app/src/main/java/org/apache/james/PostgresJamesServerMain.java b/server/apps/postgres-app/src/main/java/org/apache/james/PostgresJamesServerMain.java index f4fad8d387..ced9292a38 100644 --- a/server/apps/postgres-app/src/main/java/org/apache/james/PostgresJamesServerMain.java +++ b/server/apps/postgres-app/src/main/java/org/apache/james/PostgresJamesServerMain.java @@ -59,6 +59,8 @@ import org.apache.james.modules.protocols.POP3ServerModule; import org.apache.james.modules.protocols.ProtocolHandlerModule; import org.apache.james.modules.protocols.SMTPServerModule; import org.apache.james.modules.queue.activemq.ActiveMQQueueModule; +import org.apache.james.modules.queue.rabbitmq.FakeMailQueueViewModule; +import org.apache.james.modules.queue.rabbitmq.RabbitMQMailQueueModule; import org.apache.james.modules.queue.rabbitmq.RabbitMQModule; import org.apache.james.modules.server.DLPRoutesModule; import org.apache.james.modules.server.DataRoutesModules; @@ -70,6 +72,7 @@ import org.apache.james.modules.server.MailQueueRoutesModule; import org.apache.james.modules.server.MailRepositoriesRoutesModule; import org.apache.james.modules.server.MailboxRoutesModule; import org.apache.james.modules.server.MailboxesExportRoutesModule; +import org.apache.james.modules.server.RabbitMailQueueRoutesModule; import org.apache.james.modules.server.ReIndexingModule; import org.apache.james.modules.server.SieveRoutesModule; import org.apache.james.modules.server.TaskManagerModule; @@ -123,7 +126,6 @@ public class PostgresJamesServerMain implements JamesServerMain { WEBADMIN); private static final Module POSTGRES_SERVER_MODULE = Modules.combine( - new ActiveMQQueueModule(), new BlobExportMechanismModule(), new PostgresDelegationStoreModule(), new PostgresMailboxModule(), @@ -205,10 +207,14 @@ public class PostgresJamesServerMain implements JamesServerMain { public static List<Module> chooseEventBusModules(PostgresJamesConfiguration configuration) { switch (configuration.eventBusImpl()) { case IN_MEMORY: - return List.of(new DefaultEventModule()); + return List.of(new DefaultEventModule(), + new ActiveMQQueueModule()); case RABBITMQ: return List.of(new RabbitMQModule(), - Modules.override(new DefaultEventModule()).with(new RabbitMQEventBusModule())); + Modules.override(new DefaultEventModule()).with(new RabbitMQEventBusModule()), + new RabbitMQMailQueueModule(), + new FakeMailQueueViewModule(), + new RabbitMailQueueRoutesModule()); default: throw new RuntimeException("Unsupported event-bus implementation " + configuration.eventBusImpl().name()); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
