Skip to content

Fix DLQ inheritance for RabbitMQ tenants #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
frankvdb7 merged 3 commits into from
Jun 27, 2025
Merged

Fix DLQ inheritance for RabbitMQ tenants #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
60fe918
docs: fix comment style
frankvdb7 Jun 27, 2025
2c8947a
Use .NET 8 SDK
frankvdb7 Jun 27, 2025
81f4629
Encapsulate DLQ cloning and restore SDK version
frankvdb7 Jun 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 30 additions & 2 deletions src/Transports/RabbitMQ/Wolverine.RabbitMQ.Tests/Internals/multi_tenancy_internals.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,35 @@ public void add_tenant_by_explicit_configuration()
var transport = new RabbitMqTransport();
var expression = new RabbitMqTransportExpression(transport, new WolverineOptions());
expression.AddTenant("one", c => c.HostName = "server2");

transport.Tenants["one"].Transport.ConnectionFactory.HostName.ShouldBe("server2");
}
}

[Fact]
public void global_dead_letter_queueing_applies_to_new_tenants()
{
var transport = new RabbitMqTransport();
transport.ConfigureFactory(_ => { });
var expression = new RabbitMqTransportExpression(transport, new WolverineOptions());

expression.CustomizeDeadLetterQueueing(new DeadLetterQueue("errors"));
expression.AddTenant("one", "vh1");

var tenantTransport = transport.Tenants["one"].Compile(transport);
tenantTransport.DeadLetterQueue.QueueName.ShouldBe("errors");
}

[Fact]
public void global_dead_letter_queueing_applies_to_existing_tenants()
{
var transport = new RabbitMqTransport();
transport.ConfigureFactory(_ => { });
var expression = new RabbitMqTransportExpression(transport, new WolverineOptions());

expression.AddTenant("one", "vh1");
expression.CustomizeDeadLetterQueueing(new DeadLetterQueue("errors"));

var tenantTransport = transport.Tenants["one"].Compile(transport);
tenantTransport.DeadLetterQueue.QueueName.ShouldBe("errors");
}
}
19 changes: 16 additions & 3 deletions src/Transports/RabbitMQ/Wolverine.RabbitMQ/Internal/RabbitMqTenant.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,26 +28,39 @@ public RabbitMqTransport Compile(RabbitMqTransport parent)
if (VirtualHostName.IsNotEmpty())
{
var props = typeof(ConnectionFactory).GetProperties();

Transport.ConfigureFactory(f =>
{
foreach (var prop in props)
{
if (!prop.CanWrite) continue;

prop.SetValue(f, prop.GetValue(parent.ConnectionFactory));
}

f.VirtualHost = VirtualHostName;
});
}

CloneDeadLetterQueue(parent);

return Transport!;
}

private void CloneDeadLetterQueue(RabbitMqTransport parent)
{
// Copy the parent dead letter queue configuration to the tenant
Transport.DeadLetterQueue.Mode = parent.DeadLetterQueue.Mode;
Transport.DeadLetterQueue.QueueName = parent.DeadLetterQueue.QueueName;
Transport.DeadLetterQueue.ExchangeName = parent.DeadLetterQueue.ExchangeName;
Transport.DeadLetterQueue.BindingName = parent.DeadLetterQueue.BindingName;
Transport.DeadLetterQueue.ConfigureQueue = parent.DeadLetterQueue.ConfigureQueue;
Transport.DeadLetterQueue.ConfigureExchange = parent.DeadLetterQueue.ConfigureExchange;
}

public Task ConnectAsync(RabbitMqTransport parent, IWolverineRuntime runtime)
{
Compile(parent);
return Transport.ConnectAsync(runtime).AsTask();
}
}
}