mirrors/CleanArchitecture
0
0
Fork 0
mirror of https://github.com/alex289/CleanArchitecture.git synced 2025-06-30 02:31:08 +00:00
Code

feat: Fix rabbitmq registration

Browse Source
This commit is contained in:
alex289 2024-11-21 22:08:39 +01:00
parent 425da0b450
commit 693ca4589d
No known key found for this signature in database
GPG Key ID: 573F77CD2D87F863
5 changed files with 52 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
CleanArchitecture.Api/Extensions/ConfigurationExtensions.cs Normal file
View File

@ -0,0 +1,41 @@
using System;
using CleanArchitecture.Domain.Rabbitmq;
using Microsoft.Extensions.Configuration;
namespace CleanArchitecture.Api.Extensions;
public static class ConfigurationExtensions
{
public static RabbitMqConfiguration GetRabbitMqConfiguration(
this IConfiguration configuration)
{
var isAspire = configuration["ASPIRE_ENABLED"] == "true";
var rabbitEnabled = configuration["RabbitMQ:Enabled"];
var rabbitHost = configuration["RabbitMQ:Host"];
var rabbitPort = configuration["RabbitMQ:Port"];
var rabbitUser = configuration["RabbitMQ:Username"];
var rabbitPass = configuration["RabbitMQ:Password"];
if (isAspire)
{
rabbitEnabled = "true";
var connectionString = configuration["ConnectionStrings:RabbitMq"];
var rabbitUri = new Uri(connectionString!);
rabbitHost = rabbitUri.Host;
rabbitPort = rabbitUri.Port.ToString();
rabbitUser = rabbitUri.UserInfo.Split(':')[0];
rabbitPass = rabbitUri.UserInfo.Split(':')[1];
}
return new RabbitMqConfiguration()
{
Host = rabbitHost ?? "",
Port = int.Parse(rabbitPort ?? "0"),
Enabled = bool.Parse(rabbitEnabled ?? "false"),
Username = rabbitUser ?? "",
Password = rabbitPass ?? "",
};
}
}

14
CleanArchitecture.Api/Program.cs
View File

@ -32,16 +32,8 @@ builder.Services
var isAspire = builder.Configuration["ASPIRE_ENABLED"] == "true";
var rabbitHost = builder.Configuration["RabbitMQ:Host"];
var rabbitPort = builder.Configuration["RabbitMQ:Port"];
var rabbitUser = builder.Configuration["RabbitMQ:Username"];
var rabbitPass = builder.Configuration["RabbitMQ:Password"];
var rabbitConnectionString =
isAspire ? builder.Configuration["ConnectionStrings:RabbitMq"] :
$"amqp://{rabbitUser}:{rabbitPass}@{rabbitHost}:{rabbitPort}";
var rabbitConfiguration = builder.Configuration.GetRabbitMqConfiguration();
var redisConnectionString = isAspire ? builder.Configuration["ConnectionStrings:Redis"] : builder.Configuration["RedisHostName"];
var dbConnectionString = isAspire ? builder.Configuration["ConnectionStrings:Database"] : builder.Configuration["ConnectionStrings:DefaultConnection"];
if (builder.Environment.IsProduction())
@ -51,7 +43,7 @@ if (builder.Environment.IsProduction())
.AddSqlServer(dbConnectionString!)
.AddRedis(redisConnectionString!, "Redis")
.AddRabbitMQ(
rabbitConnectionString!,
rabbitConfiguration.ConnectionString,
name: "RabbitMQ");
}
@ -72,7 +64,7 @@ builder.Services.AddCommandHandlers();
builder.Services.AddNotificationHandlers();
builder.Services.AddApiUser();
builder.Services.AddRabbitMqHandler(builder.Configuration, "RabbitMQ");
builder.Services.AddRabbitMqHandler(rabbitConfiguration);
builder.Services.AddHostedService<SetInactiveUsersService>();

7
CleanArchitecture.Domain/Rabbitmq/Extensions/ServiceCollectionExtensions.cs
View File

@ -7,12 +7,9 @@ public static class ServiceCollectionExtensions
{
public static IServiceCollection AddRabbitMqHandler(
this IServiceCollection services,
IConfiguration configuration,
string rabbitMqConfigSection)
RabbitMqConfiguration configuration)
{
var rabbitMq = new RabbitMqConfiguration();
configuration.Bind(rabbitMqConfigSection, rabbitMq);
services.AddSingleton(rabbitMq);
services.AddSingleton(configuration);
services.AddSingleton<RabbitMqHandler>();
services.AddHostedService(serviceProvider => serviceProvider.GetService<RabbitMqHandler>()!);

2
CleanArchitecture.Domain/Rabbitmq/RabbitMqConfiguration.cs
View File

@ -7,4 +7,6 @@ public sealed class RabbitMqConfiguration
public bool Enabled { get; set; }
public string Username { get; set; } = string.Empty;
public string Password { get; set; } = string.Empty;
public string ConnectionString => $"amqp://{Username}:{Password}@{Host}:{Port}";
}

4
CleanArchitecture.Domain/Rabbitmq/RabbitMqHandler.cs
View File

@ -38,6 +38,8 @@ public sealed class RabbitMqHandler : BackgroundService
return;
}
_logger.LogInformation("Starting RabbitMQ connection");
var factory = new ConnectionFactory
{
AutomaticRecoveryEnabled = true,
@ -49,6 +51,8 @@ public sealed class RabbitMqHandler : BackgroundService
var connection = await factory.CreateConnectionAsync(cancellationToken);
_channel = await connection.CreateChannelAsync(null, cancellationToken);
await base.StartAsync(cancellationToken);
}