Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-02-27 03:41:30 +01:00
Code Issues Projects Releases Wiki Activity

catch errors when processing notification messages

Browse Source
This commit is contained in:
Kyle Spearrin 2019-05-07 22:06:05 -04:00
parent 1c38fcda85
commit 4e65275a2f
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/Notifications/AzureQueueHostedService.cs
View File

@ -60,19 +60,39 @@ namespace Bit.Notifications
while(!cancellationToken.IsCancellationRequested)
{
var messages = await _queue.GetMessagesAsync(32, TimeSpan.FromMinutes(1),
null, null, cancellationToken);
if(messages.Any())
try
{
foreach(var message in messages)
var messages = await _queue.GetMessagesAsync(32, TimeSpan.FromMinutes(1),
null, null, cancellationToken);
if(messages.Any())
{
await HubHelpers.SendNotificationToHubAsync(message.AsString, _hubContext, cancellationToken);
await _queue.DeleteMessageAsync(message);
foreach(var message in messages)
{
try
{
await HubHelpers.SendNotificationToHubAsync(
message.AsString, _hubContext, cancellationToken);
await _queue.DeleteMessageAsync(message);
}
catch(Exception e)
{
_logger.LogError("Error processing dequeued message: " +
$"{message.Id} x{message.DequeueCount}.", e);
if(message.DequeueCount > 2)
{
await _queue.DeleteMessageAsync(message);
}
}
}
}
else
{
await Task.Delay(TimeSpan.FromSeconds(5), cancellationToken);
}
}
else
catch(Exception e)
{
await Task.Delay(TimeSpan.FromSeconds(5), cancellationToken);
_logger.LogError("Error processing messages.", e);
}
}
}