bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2026-01-05 18:13:31 +00:00
Code Issues Releases Wiki Activity

Notifications service unit test coverage with small refactor (#6126)

Browse Source
This commit is contained in:
Maciej Zieniuk
2025-10-23 14:40:57 +02:00
committed by GitHub
parent 69f0464e05
commit dd1f0a120a
6 changed files with 380 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/Notifications/AzureQueueHostedService.cs
View File

@@ -1,34 +1,26 @@
// FIXME: Update this file to be null safe and then delete the line below
#nullable disable
using Azure.Storage.Queues;
using Azure.Storage.Queues;
using Bit.Core.Settings;
using Bit.Core.Utilities;
using Microsoft.AspNetCore.SignalR;
namespace Bit.Notifications;
public class AzureQueueHostedService : IHostedService, IDisposable
{
private readonly ILogger _logger;
private readonly IHubContext<NotificationsHub> _hubContext;
private readonly IHubContext<AnonymousNotificationsHub> _anonymousHubContext;
private readonly HubHelpers _hubHelpers;
private readonly GlobalSettings _globalSettings;
private Task _executingTask;
private CancellationTokenSource _cts;
private QueueClient _queueClient;
private Task? _executingTask;
private CancellationTokenSource? _cts;
public AzureQueueHostedService(
ILogger<AzureQueueHostedService> logger,
IHubContext<NotificationsHub> hubContext,
IHubContext<AnonymousNotificationsHub> anonymousHubContext,
HubHelpers hubHelpers,
GlobalSettings globalSettings)
{
_logger = logger;
_hubContext = hubContext;
_hubHelpers = hubHelpers;
_globalSettings = globalSettings;
_anonymousHubContext = anonymousHubContext;
}
public Task StartAsync(CancellationToken cancellationToken)
@@ -44,32 +36,39 @@ public class AzureQueueHostedService : IHostedService, IDisposable
{
return;
}
_logger.LogWarning("Stopping service.");
_cts.Cancel();
_cts?.Cancel();
await Task.WhenAny(_executingTask, Task.Delay(-1, cancellationToken));
cancellationToken.ThrowIfCancellationRequested();
}
public void Dispose()
{ }
{
}
private async Task ExecuteAsync(CancellationToken cancellationToken)
{
_queueClient = new QueueClient(_globalSettings.Notifications.ConnectionString, "notifications");
var queueClient = new QueueClient(_globalSettings.Notifications.ConnectionString, "notifications");
while (!cancellationToken.IsCancellationRequested)
{
try
{
var messages = await _queueClient.ReceiveMessagesAsync(32);
var messages = await queueClient.ReceiveMessagesAsync(32, cancellationToken: cancellationToken);
if (messages.Value?.Any() ?? false)
{
foreach (var message in messages.Value)
{
try
{
await HubHelpers.SendNotificationToHubAsync(
message.DecodeMessageText(), _hubContext, _anonymousHubContext, _logger, cancellationToken);
await _queueClient.DeleteMessageAsync(message.MessageId, message.PopReceipt);
var decodedMessage = message.DecodeMessageText();
if (!string.IsNullOrWhiteSpace(decodedMessage))
{
await _hubHelpers.SendNotificationToHubAsync(decodedMessage, cancellationToken);
}
await queueClient.DeleteMessageAsync(message.MessageId, message.PopReceipt,
cancellationToken);
}
catch (Exception e)
{
@@ -77,7 +76,8 @@ public class AzureQueueHostedService : IHostedService, IDisposable
message.MessageId, message.DequeueCount);
if (message.DequeueCount > 2)
{
await _queueClient.DeleteMessageAsync(message.MessageId, message.PopReceipt);
await queueClient.DeleteMessageAsync(message.MessageId, message.PopReceipt,
cancellationToken);
}
}
}