Skip to content

Making sure AsyncEventHandlers are all run. Fixes issue #838. #839

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
merged 1 commit into from
May 20, 2020
+21 −11
Merged

Making sure AsyncEventHandlers are all run. Fixes issue #838. #839

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
6 changes: 1 addition & 5 deletions projects/RabbitMQ.Client/client/api/AsyncDefaultBasicConsumer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,7 @@ public virtual Task HandleModelShutdown(object model, ShutdownEventArgs reason)
public virtual async Task OnCancel(params string[] consumerTags)
{
IsRunning = false;
foreach (AsyncEventHandler<ConsumerEventArgs> h in ConsumerCancelled?.GetInvocationList() ?? Array.Empty<Delegate>())
{
await h(this, new ConsumerEventArgs(consumerTags)).ConfigureAwait(false);
}

await ConsumerCancelled.InvokeAsync(this, new ConsumerEventArgs(consumerTags)).ConfigureAwait(false);
foreach (string consumerTag in consumerTags)
{
_consumerTags.Remove(consumerTag);
Expand Down
16 changes: 15 additions & 1 deletion projects/RabbitMQ.Client/client/events/AsyncEventHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,18 @@
namespace RabbitMQ.Client.Events
{
public delegate Task AsyncEventHandler<in TEvent>(object sender, TEvent @event) where TEvent : EventArgs;
}

internal static class AsyncEventHandlerExtensions
{
public static async Task InvokeAsync<TEvent>(this AsyncEventHandler<TEvent> eventHandler, object sender, TEvent @event) where TEvent : EventArgs
{
if(eventHandler != null)
{
foreach(AsyncEventHandler<TEvent> handlerInstance in eventHandler.GetInvocationList())
{
await handlerInstance(sender, @event).ConfigureAwait(false);
}
}
}
}
}
10 changes: 5 additions & 5 deletions projects/RabbitMQ.Client/client/events/AsyncEventingBasicConsumer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,28 +34,28 @@ public AsyncEventingBasicConsumer(IModel model) : base(model)
public override async Task HandleBasicCancelOk(string consumerTag)
{
await base.HandleBasicCancelOk(consumerTag).ConfigureAwait(false);
await (Unregistered?.Invoke(this, new ConsumerEventArgs(new[] { consumerTag })) ?? Task.CompletedTask).ConfigureAwait(false);
await Unregistered.InvokeAsync(this, new ConsumerEventArgs(new[] { consumerTag })).ConfigureAwait(false);
}

///<summary>Fires when the server confirms successful consumer registration.</summary>
public override async Task HandleBasicConsumeOk(string consumerTag)
{
await base.HandleBasicConsumeOk(consumerTag).ConfigureAwait(false);
await (Registered?.Invoke(this, new ConsumerEventArgs(new[] { consumerTag })) ?? Task.CompletedTask).ConfigureAwait(false);
await Registered.InvokeAsync(this, new ConsumerEventArgs(new[] { consumerTag })).ConfigureAwait(false);
}

///<summary>Fires the Received event.</summary>
public override async Task HandleBasicDeliver(string consumerTag, ulong deliveryTag, bool redelivered, string exchange, string routingKey, IBasicProperties properties, ReadOnlyMemory<byte> body)
{
await base.HandleBasicDeliver(consumerTag, deliveryTag, redelivered, exchange, routingKey, properties, body);
await (Received?.Invoke(this, new BasicDeliverEventArgs(consumerTag, deliveryTag, redelivered, exchange, routingKey, properties, body)) ?? Task.CompletedTask).ConfigureAwait(false);
await base.HandleBasicDeliver(consumerTag, deliveryTag, redelivered, exchange, routingKey, properties, body).ConfigureAwait(false);
await Received.InvokeAsync(this, new BasicDeliverEventArgs(consumerTag, deliveryTag, redelivered, exchange, routingKey, properties, body)).ConfigureAwait(false);
}

///<summary>Fires the Shutdown event.</summary>
public override async Task HandleModelShutdown(object model, ShutdownEventArgs reason)
{
await base.HandleModelShutdown(model, reason).ConfigureAwait(false);
await (Shutdown?.Invoke(this, reason) ?? Task.CompletedTask).ConfigureAwait(false);
await Shutdown.InvokeAsync(this, reason).ConfigureAwait(false);
}
}
}