diff --git a/src/DotNetCore.CAP.InMemoryStorage/IDataStorage.InMemory.cs b/src/DotNetCore.CAP.InMemoryStorage/IDataStorage.InMemory.cs index 7560633..ee01cf3 100644 --- a/src/DotNetCore.CAP.InMemoryStorage/IDataStorage.InMemory.cs +++ b/src/DotNetCore.CAP.InMemoryStorage/IDataStorage.InMemory.cs @@ -32,12 +32,14 @@ namespace DotNetCore.CAP.InMemoryStorage public Task ChangePublishStateAsync(MediumMessage message, StatusName state) { PublishedMessages[message.DbId].StatusName = state; + PublishedMessages[message.DbId].ExpiresAt = message.ExpiresAt; return Task.CompletedTask; } public Task ChangeReceiveStateAsync(MediumMessage message, StatusName state) { ReceivedMessages[message.DbId].StatusName = state; + ReceivedMessages[message.DbId].ExpiresAt = message.ExpiresAt; return Task.CompletedTask; } @@ -106,7 +108,7 @@ namespace DotNetCore.CAP.InMemoryStorage Retries = mdMessage.Retries, Added = mdMessage.Added, ExpiresAt = mdMessage.ExpiresAt, - StatusName = StatusName.Failed + StatusName = StatusName.Scheduled }; return mdMessage; } diff --git a/src/DotNetCore.CAP/Internal/IConsumerRegister.Default.cs b/src/DotNetCore.CAP/Internal/IConsumerRegister.Default.cs index 9ab5f0e..5e8e67a 100644 --- a/src/DotNetCore.CAP/Internal/IConsumerRegister.Default.cs +++ b/src/DotNetCore.CAP/Internal/IConsumerRegister.Default.cs @@ -152,8 +152,7 @@ namespace DotNetCore.CAP.Internal client.OnMessageReceived += async (sender, transportMessage) => { _logger.MessageReceived(transportMessage.GetId(), transportMessage.GetName()); - - _cts.Token.ThrowIfCancellationRequested(); + long? tracingTimestamp = null; try {