bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2025-12-30 07:03:42 +00:00
Code Issues Releases Wiki Activity

[BRE-1058] fix alpine race condition (#6156)

Browse Source 
* alpine race condition during shutdown fix

* change catch to only be for relevant task cancelled, added a debug log

* test commit for build and test

* remove testing comment
This commit is contained in:
aj-bw
2025-08-05 09:20:54 -04:00
committed by GitHub
parent 1c2bccdeff
commit 9081c205b1
3 changed files with 59 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/EventsProcessor/AzureQueueHostedService.cs
View File

@@ -86,11 +86,24 @@ public class AzureQueueHostedService : IHostedService, IDisposable
await Task.Delay(TimeSpan.FromSeconds(5), cancellationToken);
}
}
catch (TaskCanceledException) when (cancellationToken.IsCancellationRequested)
{
_logger.LogDebug("Task.Delay cancelled during Alpine container shutdown");
break;
}
catch (Exception ex)
{
_logger.LogError(ex, "Error occurred processing message block.");
await Task.Delay(TimeSpan.FromSeconds(5), cancellationToken);
try
{
await Task.Delay(TimeSpan.FromSeconds(5), cancellationToken);
}
catch (TaskCanceledException) when (cancellationToken.IsCancellationRequested)
{
_logger.LogDebug("Task.Delay cancelled during Alpine container shutdown");
break;
}
}
}