Skip to content

Make sure OnCallbackException is executed for AsyncConsumers #946

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
michaelklishin merged 7 commits into from
Sep 30, 2020
Merged

Make sure OnCallbackException is executed for AsyncConsumers #946

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0cb0918
Always call to await when executing a task in AsyncConsumerWorkServic…
BarShavit Sep 25, 2020
fde86f1
Fixed few warning issues
BarShavit Sep 25, 2020
ec1a9c0
Reverted the last changes.
BarShavit Sep 25, 2020
24af303
Converted to GetAwaiter to catch exceptions
BarShavit Sep 25, 2020
c9553d2
Fixed AsyncConsumerExceptionTests
BarShavit Sep 26, 2020
34619d4
Changed the async await to Task.FromException in TestAsyncConsumerExc…
BarShavit Sep 27, 2020
f4e9b4f
Changed tests to use reset event, so they will run faster.
BarShavit Sep 28, 2020
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
22 changes: 20 additions & 2 deletions projects/RabbitMQ.Client/client/impl/AsyncConsumerWorkService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,16 @@ private async Task Loop()
try
{
Task task = work.Execute();
await task.ConfigureAwait(false);
if (!task.IsCompleted)
{
await task.ConfigureAwait(false);
}

// Without await, the exception will disappear
if(task.Exception != null)
{
throw task.Exception.InnerException;
}
}
catch (Exception e)
{
Expand Down Expand Up @@ -143,7 +152,16 @@ private static async Task HandleConcurrent(Work work, IModel model, SemaphoreSli
try
{
Task task = work.Execute();
await task.ConfigureAwait(false);
if (!task.IsCompleted)
{
await task.ConfigureAwait(false);
}

// Without await, the exception will disappear
if (task.Exception != null)
{
throw task.Exception.InnerException;
}
}
catch (Exception e)
{
Expand Down