Skip to content
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

Fix timeout poller and startup diagnostics bugs #608

Merged
merged 2 commits into from
Sep 5, 2023
Merged

Fix timeout poller and startup diagnostics bugs #608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
38f0b92
Don't Task.Delay() for longer than MaxSleepDuration
DavidBoike Aug 31, 2023
621a7a5
Don't add a Type to the StartupDiagnostics that isn't serializable by…
DavidBoike Aug 31, 2023
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
5 changes: 5 additions & 0 deletions src/NServiceBus.Transport.Msmq/DelayedDelivery/DueDelayedMessagePoller.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,11 @@ Task WaitIfNeeded(DateTimeOffset nextPoll, CancellationToken cancellationToken)
var waitTime = nextPoll - DateTimeOffset.UtcNow;
if (waitTime > TimeSpan.Zero)
{
if (waitTime > MaxSleepDuration)
{
// Task.Delay() throws for times > int.MaxValue ms, which is ~24.85 days
waitTime = MaxSleepDuration;
}
return Task.Delay(waitTime, cancellationToken);
}

Expand Down
2 changes: 1 addition & 1 deletion src/NServiceBus.Transport.Msmq/MsmqTransport.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ public override async Task<TransportInfrastructure> Initialize(HostSettings host
UseDeadLetterQueueForMessagesWithTimeToBeReceived,
TimeToReachQueue = GetFormattedTimeToReachQueue(TimeToReachQueue),
TimeoutQueue = delayedDeliveryMessagePump?.ReceiveAddress,
TimeoutStorageType = DelayedDelivery?.DelayedMessageStore?.GetType(),
TimeoutStorageType = DelayedDelivery?.DelayedMessageStore?.GetType()?.FullName,
});

var infrastructure = new MsmqTransportInfrastructure(messageReceivers, dispatcher, delayedDeliveryPump);
Expand Down