bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2025-12-31 15:43:16 +00:00
Code Issues Releases Wiki Activity

upgrade to aspnet core 3.1

Browse Source
This commit is contained in:
Kyle Spearrin
2020-01-10 08:33:13 -05:00
parent 8026912eeb
commit 29580684a3
60 changed files with 429 additions and 420 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/Notifications/AzureQueueHostedService.cs
View File

@@ -6,8 +6,7 @@ using Bit.Core;
using Microsoft.AspNetCore.SignalR;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Microsoft.WindowsAzure.Storage;
using Microsoft.WindowsAzure.Storage.Queue;
using Azure.Storage.Queues;
namespace Bit.Notifications
{
@@ -19,7 +18,7 @@ namespace Bit.Notifications
private Task _executingTask;
private CancellationTokenSource _cts;
private CloudQueue _queue;
private QueueClient _queueClient;
public AzureQueueHostedService(
ILogger<AzureQueueHostedService> logger,
@@ -55,33 +54,29 @@ namespace Bit.Notifications
private async Task ExecuteAsync(CancellationToken cancellationToken)
{
var storageAccount = CloudStorageAccount.Parse(_globalSettings.Notifications.ConnectionString);
var queueClient = storageAccount.CreateCloudQueueClient();
_queue = queueClient.GetQueueReference("notifications");
_queueClient = new QueueClient(_globalSettings.Notifications.ConnectionString, "notifications");
while(!cancellationToken.IsCancellationRequested)
{
try
{
var messages = await _queue.GetMessagesAsync(32, TimeSpan.FromMinutes(1),
null, null, cancellationToken);
if(messages.Any())
var messages = await _queueClient.ReceiveMessagesAsync(32);
if(messages.Value?.Any() ?? false)
{
foreach(var message in messages)
foreach(var message in messages.Value)
{
try
{
await HubHelpers.SendNotificationToHubAsync(
message.AsString, _hubContext, cancellationToken);
await _queue.DeleteMessageAsync(message);
message.MessageText, _hubContext, cancellationToken);
await _queueClient.DeleteMessageAsync(message.MessageId, message.PopReceipt);
}
catch(Exception e)
{
_logger.LogError("Error processing dequeued message: " +
$"{message.Id} x{message.DequeueCount}.", e);
$"{message.MessageId} x{message.DequeueCount}.", e);
if(message.DequeueCount > 2)
{
await _queue.DeleteMessageAsync(message);
await _queueClient.DeleteMessageAsync(message.MessageId, message.PopReceipt);
}
}
}