Prevented creation of default queues for temporary consumers (#5148)

elsa-workflows · Mar 28, 2024 · 673f5df · 673f5df
1 parent 4b151ff
commit 673f5df
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/src/modules/Elsa.MassTransit.AzureServiceBus/Features/AzureServiceBusFeature.cs b/src/modules/Elsa.MassTransit.AzureServiceBus/Features/AzureServiceBusFeature.cs
@@ -60,10 +60,9 @@ public override void Configure()
                 var temporaryConsumers = consumers
                     .Where(c => c.IsTemporary)
                     .ToList();
-                
+
                 RegisterConsumers(consumers);
                 configure.AddServiceBusMessageScheduler();
-                configure.AddConsumers(temporaryConsumers.Select(c => c.ConsumerType).ToArray());
 
                 configure.UsingAzureServiceBus((context, configurator) =>
                 {
@@ -79,11 +78,12 @@ public override void Configure()
                     
                     foreach (var consumer in temporaryConsumers)
                     {
-                        configurator.ReceiveEndpoint($"Elsa-{instanceNameProvider.GetName()}-{consumer.Name}", configurator =>
+                        configure.AddConsumer(consumer.ConsumerType).ExcludeFromConfigureEndpoints();
+                        configurator.ReceiveEndpoint($"Elsa-{instanceNameProvider.GetName()}-{consumer.Name}", endpointConfigurator =>
                         {
-                            configurator.AutoDeleteOnIdle = options.TemporaryQueueTtl ?? TimeSpan.FromHours(1);
-                            configurator.ConcurrentMessageLimit = options.ConcurrentMessageLimit;
-                            configurator.ConfigureConsumer(context, consumer.ConsumerType);
+                            endpointConfigurator.AutoDeleteOnIdle = options.TemporaryQueueTtl ?? TimeSpan.FromHours(1);
+                            endpointConfigurator.ConcurrentMessageLimit = options.ConcurrentMessageLimit;
+                            endpointConfigurator.ConfigureConsumer(context, consumer.ConsumerType);
                         });
                     }
 

diff --git a/src/modules/Elsa.MassTransit.RabbitMq/Features/RabbitMqServiceBusFeature.cs b/src/modules/Elsa.MassTransit.RabbitMq/Features/RabbitMqServiceBusFeature.cs
@@ -48,8 +48,6 @@ public override void Configure()
                     .Where(c => c.IsTemporary)
                     .ToList();
 
-                configure.AddConsumers(tempConsumers.Select(c => c.ConsumerType).ToArray());
-
                 configure.UsingRabbitMq((context, configurator) =>
                 {
                     var options = context.GetRequiredService<IOptions<MassTransitWorkflowDispatcherOptions>>().Value;
@@ -62,6 +60,8 @@ public override void Configure()
 
                     foreach (var consumer in tempConsumers)
                     {
+                        configure.AddConsumer(consumer.ConsumerType).ExcludeFromConfigureEndpoints();
+                        
                         configurator.ReceiveEndpoint($"{instanceNameProvider.GetName()}-{consumer.Name}",
                             configurator =>
                             {

diff --git a/src/modules/Elsa.MassTransit/Features/MassTransitFeature.cs b/src/modules/Elsa.MassTransit/Features/MassTransitFeature.cs
@@ -81,6 +81,7 @@ private void AddMassTransit(Action<IBusRegistrationConfigurator> busConfigurator
 
         // Concatenate the manually registered consumers with the workflow message consumers.
         var consumerTypeDefinitions = this.GetConsumers()
+            .Where(c => !c.IsTemporary)
             .Concat(workflowMessageConsumers)
             .ToArray();