Browse Source

Make deadletterName optional

pull/8829/head
liangshiwei 5 years ago
parent
commit
7e686315fa
  1. 8
      framework/src/Volo.Abp.EventBus.RabbitMQ/Volo/Abp/EventBus/RabbitMq/RabbitMqDistributedEventBus.cs
  2. 4
      framework/src/Volo.Abp.RabbitMQ/Volo/Abp/RabbitMQ/ExchangeDeclareConfiguration.cs
  3. 5
      framework/src/Volo.Abp.RabbitMQ/Volo/Abp/RabbitMQ/QueueDeclareConfiguration.cs

8
framework/src/Volo.Abp.EventBus.RabbitMQ/Volo/Abp/EventBus/RabbitMq/RabbitMqDistributedEventBus.cs

@ -66,16 +66,16 @@ namespace Volo.Abp.EventBus.RabbitMq
Consumer = MessageConsumerFactory.Create(
new ExchangeDeclareConfiguration(
AbpRabbitMqEventBusOptions.ExchangeName,
AbpRabbitMqEventBusOptions.ExchangeName + suffix,
type: "direct",
durable: true
durable: true,
deadLetterExchangeName: AbpRabbitMqEventBusOptions.ExchangeName + suffix
),
new QueueDeclareConfiguration(
AbpRabbitMqEventBusOptions.ClientName,
AbpEventBusOptions.DeadLetterName ?? AbpRabbitMqEventBusOptions.ClientName + suffix,
durable: true,
exclusive: false,
autoDelete: false
autoDelete: false,
AbpEventBusOptions.DeadLetterName ?? AbpRabbitMqEventBusOptions.ClientName + suffix
),
AbpRabbitMqEventBusOptions.ConnectionName
);

4
framework/src/Volo.Abp.RabbitMQ/Volo/Abp/RabbitMQ/ExchangeDeclareConfiguration.cs

@ -18,10 +18,10 @@ namespace Volo.Abp.RabbitMQ
public ExchangeDeclareConfiguration(
string exchangeName,
string deadLetterExchangeName,
string type,
bool durable = false,
bool autoDelete = false)
bool autoDelete = false,
string deadLetterExchangeName = null)
{
ExchangeName = exchangeName;
DeadLetterExchangeName = deadLetterExchangeName;

5
framework/src/Volo.Abp.RabbitMQ/Volo/Abp/RabbitMQ/QueueDeclareConfiguration.cs

@ -20,18 +20,17 @@ namespace Volo.Abp.RabbitMQ
public QueueDeclareConfiguration(
[NotNull] string queueName,
string deadLetterQueueName,
bool durable = true,
bool exclusive = false,
bool autoDelete = false,
Dictionary<string, object> arguments = null)
string deadLetterQueueName = null)
{
QueueName = queueName;
DeadLetterQueueName = deadLetterQueueName;
Durable = durable;
Exclusive = exclusive;
AutoDelete = autoDelete;
Arguments = arguments ?? new Dictionary<string, object>();
Arguments = new Dictionary<string, object>();
}
public virtual QueueDeclareOk Declare(IModel channel)

Loading…
Cancel
Save