SemianiakaVY/elsa-core
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
raymonddenhaan 2024-03-28 15:42:51 +01:00 committed by GitHub
parent 4b151ff8af
commit 673f5dfdbc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/modules/Elsa.MassTransit.AzureServiceBus/Features/AzureServiceBusFeature.cs
View file

@ -60,10 +60,9 @@ public class AzureServiceBusFeature : FeatureBase
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 class AzureServiceBusFeature : FeatureBase
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);
});
}

4
src/modules/Elsa.MassTransit.RabbitMq/Features/RabbitMqServiceBusFeature.cs
View file

@ -48,8 +48,6 @@ public class RabbitMqServiceBusFeature : FeatureBase
.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 class RabbitMqServiceBusFeature : FeatureBase
foreach (var consumer in tempConsumers)
{
configure.AddConsumer(consumer.ConsumerType).ExcludeFromConfigureEndpoints();
configurator.ReceiveEndpoint($"{instanceNameProvider.GetName()}-{consumer.Name}",
configurator =>
{

1
src/modules/Elsa.MassTransit/Features/MassTransitFeature.cs
View file

@ -81,6 +81,7 @@ public class MassTransitFeature : FeatureBase
// Concatenate the manually registered consumers with the workflow message consumers.
var consumerTypeDefinitions = this.GetConsumers()
.Where(c => !c.IsTemporary)
.Concat(workflowMessageConsumers)
.ToArray();