Implemented #37 Support injection of CancellationToken in message handlers
This commit is contained in:
parent
2ffae2e7fe
commit
56a842ea5c
@ -1,4 +1,5 @@
|
||||
using System;
|
||||
using System.Threading;
|
||||
|
||||
// ReSharper disable UnusedMemberInSuper.Global - public API
|
||||
// ReSharper disable UnusedMember.Global
|
||||
@ -50,6 +51,13 @@ namespace Tapeti.Config
|
||||
/// </remarks>
|
||||
IBinding Binding { get; }
|
||||
|
||||
/// <summary>
|
||||
/// Contains a CancellationToken which is cancelled when the connection to the RabbitMQ server is closed.
|
||||
/// Note that this token is cancelled regardless of whether the connection will be reestablished, as any
|
||||
/// messages still in the queue will be redelivered with a new token.
|
||||
/// </summary>
|
||||
CancellationToken ConnectionClosed { get; }
|
||||
|
||||
/// <summary>
|
||||
/// Stores additional properties in the message context which can be passed between middleware stages.
|
||||
/// </summary>
|
||||
|
@ -74,7 +74,8 @@ namespace Tapeti.Connection
|
||||
RawBody = body,
|
||||
Message = message,
|
||||
Properties = properties,
|
||||
Binding = null
|
||||
Binding = null,
|
||||
ConnectionClosed = CancellationToken.None
|
||||
};
|
||||
|
||||
var exceptionContext = new ExceptionStrategyContext(emptyContext, dispatchException);
|
||||
@ -118,7 +119,8 @@ namespace Tapeti.Connection
|
||||
RawBody = messageContextData.RawBody,
|
||||
Message = message,
|
||||
Properties = messageContextData.Properties,
|
||||
Binding = binding
|
||||
Binding = binding,
|
||||
ConnectionClosed = cancellationToken
|
||||
};
|
||||
|
||||
try
|
||||
|
25
Tapeti/Default/CancellationTokenBinding.cs
Normal file
25
Tapeti/Default/CancellationTokenBinding.cs
Normal file
@ -0,0 +1,25 @@
|
||||
using System;
|
||||
using System.Linq;
|
||||
using System.Threading;
|
||||
using Tapeti.Config;
|
||||
|
||||
namespace Tapeti.Default
|
||||
{
|
||||
/// <inheritdoc />
|
||||
/// <summary>
|
||||
/// Binds a parameter of type CancellationToken to a token which is cancelled when the RabbitMQ connection is closed.
|
||||
/// Similar to and very much inspired by ASP.NET's RequestAborted CancellationToken.
|
||||
/// This middleware is included by default in the standard TapetiConfig.
|
||||
/// </summary>
|
||||
public class CancellationTokenBinding : IControllerBindingMiddleware
|
||||
{
|
||||
/// <inheritdoc />
|
||||
public void Handle(IControllerBindingContext context, Action next)
|
||||
{
|
||||
foreach (var parameter in context.Parameters.Where(p => !p.HasBinding && p.Info.ParameterType == typeof(CancellationToken)))
|
||||
parameter.SetBinding(messageContext => messageContext.ConnectionClosed);
|
||||
|
||||
next();
|
||||
}
|
||||
}
|
||||
}
|
@ -1,5 +1,6 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using Tapeti.Config;
|
||||
|
||||
@ -34,7 +35,10 @@ namespace Tapeti.Default
|
||||
/// <inheritdoc />
|
||||
public IBinding Binding { get; set; }
|
||||
|
||||
|
||||
/// <inheritdoc />
|
||||
public CancellationToken ConnectionClosed { get; set; }
|
||||
|
||||
|
||||
public void Store<T>(T payload) where T : IMessageContextPayload
|
||||
{
|
||||
payloads.Add(typeof(T), payload);
|
||||
|
@ -35,6 +35,7 @@ namespace Tapeti
|
||||
|
||||
Use(new DependencyResolverBinding());
|
||||
Use(new PublishResultBinding());
|
||||
Use(new CancellationTokenBinding());
|
||||
|
||||
// Registered last so it runs first and the MessageClass is known to other middleware
|
||||
Use(new MessageBinding());
|
||||
|
@ -151,10 +151,8 @@ namespace Tapeti
|
||||
protected virtual void OnConnected(ConnectedEventArgs e)
|
||||
{
|
||||
var connectedEvent = Connected;
|
||||
if (connectedEvent == null)
|
||||
return;
|
||||
|
||||
Task.Run(() => connectedEvent.Invoke(this, e));
|
||||
if (connectedEvent != null)
|
||||
Task.Run(() => connectedEvent.Invoke(this, e));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@ -162,13 +160,11 @@ namespace Tapeti
|
||||
/// </summary>
|
||||
protected virtual void OnReconnected(ConnectedEventArgs e)
|
||||
{
|
||||
var reconnectedEvent = Reconnected;
|
||||
if (reconnectedEvent == null && subscriber == null)
|
||||
return;
|
||||
|
||||
subscriber?.Reconnect();
|
||||
|
||||
Task.Run(() => reconnectedEvent?.Invoke(this, e));
|
||||
var reconnectedEvent = Reconnected;
|
||||
if (reconnectedEvent != null)
|
||||
Task.Run(() => reconnectedEvent?.Invoke(this, e));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@ -176,13 +172,11 @@ namespace Tapeti
|
||||
/// </summary>
|
||||
protected virtual void OnDisconnected(DisconnectedEventArgs e)
|
||||
{
|
||||
var disconnectedEvent = Disconnected;
|
||||
if (disconnectedEvent == null)
|
||||
return;
|
||||
|
||||
subscriber?.Disconnect();
|
||||
|
||||
Task.Run(() => disconnectedEvent.Invoke(this, e));
|
||||
var disconnectedEvent = Disconnected;
|
||||
if (disconnectedEvent != null)
|
||||
Task.Run(() => disconnectedEvent.Invoke(this, e));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user