Skip to content

added option to set the ReceiveMode of a service bus subscription #37

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
niemyjski merged 1 commit into from
Jun 17, 2021
Merged

added option to set the ReceiveMode of a service bus subscription #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions src/Foundatio.AzureServiceBus/Messaging/AzureServiceBusMessageBus.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@ protected override async Task EnsureTopicSubscriptionAsync(CancellationToken can

var sw = Stopwatch.StartNew();
try {
await _managementClient.CreateSubscriptionAsync(CreateSubscriptionDescription()).AnyContext();
await _managementClient.CreateSubscriptionAsync(CreateSubscriptionDescription(), cancellationToken).AnyContext();
} catch (MessagingEntityAlreadyExistsException) { }

// Look into message factory with multiple receivers so more than one connection is made and managed....
_subscriptionClient = new SubscriptionClient(_options.ConnectionString, _options.Topic, _subscriptionName, ReceiveMode.ReceiveAndDelete, _options.SubscriptionRetryPolicy);
_subscriptionClient = new SubscriptionClient(_options.ConnectionString, _options.Topic, _subscriptionName, _options.SubscriptionReceiveMode, _options.SubscriptionRetryPolicy);
_subscriptionClient.RegisterMessageHandler(OnMessageAsync, new MessageHandlerOptions(MessageHandlerException) {
/* AutoComplete = true, // Don't run with receive and delete */ MaxConcurrentCalls = 6 /* calculate this based on the the thread count. */ });
if (_options.PrefetchCount.HasValue)
Expand All @@ -59,7 +59,7 @@ protected override async Task EnsureTopicSubscriptionAsync(CancellationToken can
private Task OnMessageAsync(Microsoft.Azure.ServiceBus.Message brokeredMessage, CancellationToken cancellationToken) {
if (_subscribers.IsEmpty)
return Task.CompletedTask;

_logger.LogTrace("OnMessageAsync({messageId})", brokeredMessage.MessageId);
var message = new Message(() => DeserializeMessageBody(brokeredMessage.ContentType, brokeredMessage.Body)) {
Data = brokeredMessage.Body,
Expand Down Expand Up @@ -141,7 +141,7 @@ private TopicDescription CreateTopicDescription() {

if (!String.IsNullOrEmpty(_options.TopicUserMetadata))
td.UserMetadata = _options.TopicUserMetadata;

return td;
}

Expand Down
11 changes: 9 additions & 2 deletions src/Foundatio.AzureServiceBus/Messaging/AzureServiceBusMessageBusOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,16 +143,18 @@ public class AzureServiceBusMessageBusOptions : SharedMessageBusOptions {
public string SubscriptionUserMetadata { get; set; }

public RetryPolicy SubscriptionRetryPolicy { get; set; }

public ReceiveMode SubscriptionReceiveMode { get; set; } = ReceiveMode.ReceiveAndDelete;
}

public class AzureServiceBusMessageBusOptionsBuilder : SharedMessageBusOptionsBuilder<
AzureServiceBusMessageBusOptions, AzureServiceBusMessageBusOptionsBuilder> {

public AzureServiceBusMessageBusOptionsBuilder ConnectionString(string connectionString) {
Target.ConnectionString = connectionString;
return this;
}

public AzureServiceBusMessageBusOptionsBuilder PrefetchCount(int prefetchCount) {
Target.PrefetchCount = prefetchCount;
return this;
Expand Down Expand Up @@ -292,5 +294,10 @@ public AzureServiceBusMessageBusOptionsBuilder SubscriptionRetryPolicy(RetryPoli
Target.SubscriptionRetryPolicy = subscriptionRetryPolicy ?? throw new ArgumentNullException(nameof(subscriptionRetryPolicy));
return this;
}

public AzureServiceBusMessageBusOptionsBuilder SubscriptionReceiveMode(ReceiveMode receiveMode) {
Target.SubscriptionReceiveMode = receiveMode;
return this;
}
}
}