Ignore TaskCanceledExceptions during shutdown
This commit is contained in:
parent
b62475c830
commit
f4bef38a9f
@ -1,6 +1,7 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using System.Threading;
|
||||||
using Tapeti.Config;
|
using Tapeti.Config;
|
||||||
using Tapeti.Default;
|
using Tapeti.Default;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
@ -14,6 +15,7 @@ namespace Tapeti.Connection
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
internal class TapetiConsumer : IConsumer
|
internal class TapetiConsumer : IConsumer
|
||||||
{
|
{
|
||||||
|
private readonly CancellationToken cancellationToken;
|
||||||
private readonly ITapetiConfig config;
|
private readonly ITapetiConfig config;
|
||||||
private readonly string queueName;
|
private readonly string queueName;
|
||||||
private readonly List<IBinding> bindings;
|
private readonly List<IBinding> bindings;
|
||||||
@ -23,9 +25,9 @@ namespace Tapeti.Connection
|
|||||||
private readonly IMessageSerializer messageSerializer;
|
private readonly IMessageSerializer messageSerializer;
|
||||||
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
public TapetiConsumer(CancellationToken cancellationToken, ITapetiConfig config, string queueName, IEnumerable<IBinding> bindings)
|
||||||
public TapetiConsumer(ITapetiConfig config, string queueName, IEnumerable<IBinding> bindings)
|
|
||||||
{
|
{
|
||||||
|
this.cancellationToken = cancellationToken;
|
||||||
this.config = config;
|
this.config = config;
|
||||||
this.queueName = queueName;
|
this.queueName = queueName;
|
||||||
this.bindings = bindings.ToList();
|
this.bindings = bindings.ToList();
|
||||||
@ -80,11 +82,8 @@ namespace Tapeti.Connection
|
|||||||
var messageType = message.GetType();
|
var messageType = message.GetType();
|
||||||
var validMessageType = false;
|
var validMessageType = false;
|
||||||
|
|
||||||
foreach (var binding in bindings)
|
foreach (var binding in bindings.Where(binding => binding.Accept(messageType)))
|
||||||
{
|
{
|
||||||
if (!binding.Accept(messageType))
|
|
||||||
continue;
|
|
||||||
|
|
||||||
var consumeResult = await InvokeUsingBinding(message, messageContextData, binding);
|
var consumeResult = await InvokeUsingBinding(message, messageContextData, binding);
|
||||||
validMessageType = true;
|
validMessageType = true;
|
||||||
|
|
||||||
@ -135,6 +134,13 @@ namespace Tapeti.Connection
|
|||||||
|
|
||||||
private void HandleException(ExceptionStrategyContext exceptionContext)
|
private void HandleException(ExceptionStrategyContext exceptionContext)
|
||||||
{
|
{
|
||||||
|
if (cancellationToken.IsCancellationRequested && IsTaskCanceledException(exceptionContext.Exception))
|
||||||
|
{
|
||||||
|
// The service is most likely stopping, and the connection is gone anyways.
|
||||||
|
exceptionContext.SetConsumeResult(ConsumeResult.Requeue);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
exceptionStrategy.HandleException(exceptionContext);
|
exceptionStrategy.HandleException(exceptionContext);
|
||||||
@ -150,6 +156,21 @@ namespace Tapeti.Connection
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private static bool IsTaskCanceledException(Exception e)
|
||||||
|
{
|
||||||
|
switch (e)
|
||||||
|
{
|
||||||
|
case AggregateException aggregateException:
|
||||||
|
return aggregateException.InnerExceptions.Any(IsTaskCanceledException);
|
||||||
|
|
||||||
|
case TaskCanceledException _:
|
||||||
|
return true;
|
||||||
|
|
||||||
|
default:
|
||||||
|
return e.InnerException != null && IsTaskCanceledException(e.InnerException);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
private struct MessageContextData
|
private struct MessageContextData
|
||||||
{
|
{
|
||||||
|
@ -138,7 +138,7 @@ namespace Tapeti.Connection
|
|||||||
consumerTags.AddRange(await Task.WhenAll(queues.Select(async group =>
|
consumerTags.AddRange(await Task.WhenAll(queues.Select(async group =>
|
||||||
{
|
{
|
||||||
var queueName = group.Key;
|
var queueName = group.Key;
|
||||||
var consumer = new TapetiConsumer(config, queueName, group);
|
var consumer = new TapetiConsumer(cancellationToken, config, queueName, group);
|
||||||
|
|
||||||
return await clientFactory().Consume(cancellationToken, queueName, consumer);
|
return await clientFactory().Consume(cancellationToken, queueName, consumer);
|
||||||
})));
|
})));
|
||||||
|
Loading…
Reference in New Issue
Block a user