GitHub-Mirror/Tapeti
1
0
Fork 0
mirror of synced 2024-11-22 01:13:49 +00:00
Code Issues Projects Releases Wiki Activity

Possible fix for #21 - Same request/response twice in flow does not continue?

Browse Source
This commit is contained in:
Frederik 2020-06-11 16:36:55 +02:00
parent c6700b2697
commit 13833040e8
4 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Tapeti.Flow/Default/FlowContinuationMiddleware.cs
View File

@ -52,16 +52,19 @@ namespace Tapeti.Flow.Default
} }
public async Task Cleanup(IMessageContext context, ConsumeResult consumeResult, Func<Task> next) public async Task Cleanup(IControllerMessageContext context, ConsumeResult consumeResult, Func<Task> next)
{ {
await next(); await next();
if (!context.Get(ContextItems.FlowContext, out FlowContext flowContext)) if (!context.Get(ContextItems.FlowContext, out FlowContext flowContext))
return; return;
if (flowContext.ContinuationMetadata.MethodName != MethodSerializer.Serialize(context.Binding.Method))
// Do not call when the controller method was filtered, if the same message has two methods
return;
if (flowContext?.FlowStateLock != null) if (flowContext?.FlowStateLock != null)
{ {
// TODO do not call when the controller method was filtered, if the same message has two methods
if (!flowContext.IsStoredOrDeleted()) if (!flowContext.IsStoredOrDeleted())
// The exception strategy can set the consume result to Success. Instead, check if the yield point // The exception strategy can set the consume result to Success. Instead, check if the yield point
// was handled. The flow provider ensures we only end up here in case of an exception. // was handled. The flow provider ensures we only end up here in case of an exception.

2
Tapeti/Config/IControllerCleanupMiddleware.cs
View File

@ -14,6 +14,6 @@ namespace Tapeti.Config
/// <param name="context"></param> /// <param name="context"></param>
/// <param name="consumeResult"></param> /// <param name="consumeResult"></param>
/// <param name="next">Always call to allow the next in the chain to clean up</param> /// <param name="next">Always call to allow the next in the chain to clean up</param>
Task Cleanup(IMessageContext context, ConsumeResult consumeResult, Func<Task> next); Task Cleanup(IControllerMessageContext context, ConsumeResult consumeResult, Func<Task> next);
} }
} }

2
Tapeti/Config/IControllerMessageContext.cs
View File

@ -7,7 +7,7 @@
public interface IControllerMessageContext : IMessageContext public interface IControllerMessageContext : IMessageContext
{ {
/// <summary> /// <summary>
/// An instance of the controller referenced by the binding. /// An instance of the controller referenced by the binding. Note: is null during Cleanup.
/// </summary> /// </summary>
object Controller { get; } object Controller { get; }

10
Tapeti/Default/ControllerMethodBinding.cs
View File

@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
@ -181,12 +181,18 @@ namespace Tapeti.Default
/// <inheritdoc /> /// <inheritdoc />
public async Task Cleanup(IMessageContext context, ConsumeResult consumeResult) public async Task Cleanup(IMessageContext context, ConsumeResult consumeResult)
{
using (var controllerContext = new ControllerMessageContext(context)
{
Controller = null
})
{ {
await MiddlewareHelper.GoAsync( await MiddlewareHelper.GoAsync(
bindingInfo.CleanupMiddleware, bindingInfo.CleanupMiddleware,
async (handler, next) => await handler.Cleanup(context, consumeResult, next), async (handler, next) => await handler.Cleanup(controllerContext, consumeResult, next),
() => Task.CompletedTask); () => Task.CompletedTask);
} }
}
private async Task<bool> FilterAllowed(IControllerMessageContext context) private async Task<bool> FilterAllowed(IControllerMessageContext context)