mirrors/CleanArchitecture
0
0
Fork 0
mirror of https://github.com/alex289/CleanArchitecture.git synced 2025-07-06 14:03:56 +00:00
Code

chore: Code cleanup

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

2
CleanArchitecture.Api/Extensions/ConfigurationExtensions.cs
View File

@ -35,7 +35,7 @@ public static class ConfigurationExtensions
Port = int.Parse(rabbitPort ?? "0"), Port = int.Parse(rabbitPort ?? "0"),
Enabled = bool.Parse(rabbitEnabled ?? "false"), Enabled = bool.Parse(rabbitEnabled ?? "false"),
Username = rabbitUser ?? "", Username = rabbitUser ?? "",
Password = rabbitPass ?? "", Password = rabbitPass ?? ""
}; };
} }
} }

7
CleanArchitecture.Api/Program.cs
View File

@ -33,8 +33,11 @@ builder.Services
var isAspire = builder.Configuration["ASPIRE_ENABLED"] == "true"; var isAspire = builder.Configuration["ASPIRE_ENABLED"] == "true";
var rabbitConfiguration = builder.Configuration.GetRabbitMqConfiguration(); var rabbitConfiguration = builder.Configuration.GetRabbitMqConfiguration();
var redisConnectionString = isAspire ? builder.Configuration["ConnectionStrings:Redis"] : builder.Configuration["RedisHostName"]; var redisConnectionString =
var dbConnectionString = isAspire ? builder.Configuration["ConnectionStrings:Database"] : builder.Configuration["ConnectionStrings:DefaultConnection"]; isAspire ? builder.Configuration["ConnectionStrings:Redis"] : builder.Configuration["RedisHostName"];
var dbConnectionString = isAspire
? builder.Configuration["ConnectionStrings:Database"]
: builder.Configuration["ConnectionStrings:DefaultConnection"];
if (builder.Environment.IsProduction()) if (builder.Environment.IsProduction())
{ {

4
CleanArchitecture.AppHost/Program.cs
View File

@ -3,7 +3,7 @@ var builder = DistributedApplication.CreateBuilder(args);
var redis = builder.AddRedis("Redis"); var redis = builder.AddRedis("Redis");
var rabbitPasswordRessource = new ParameterResource("password", _ => "guest"); var rabbitPasswordRessource = new ParameterResource("password", _ => "guest");
var rabbitPasswordParameter = var rabbitPasswordParameter =
builder.AddParameter("username", rabbitPasswordRessource.Value); builder.AddParameter("username", rabbitPasswordRessource.Value);
var rabbitMq = builder var rabbitMq = builder
@ -22,4 +22,4 @@ builder.AddProject<Projects.CleanArchitecture_Api>("CleanArchitecture-Api")
.WithReference(db) .WithReference(db)
.WaitFor(sqlServer); .WaitFor(sqlServer);
builder.Build().Run(); builder.Build().Run();

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

@ -1,4 +1,3 @@
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
namespace CleanArchitecture.Domain.Rabbitmq.Extensions; namespace CleanArchitecture.Domain.Rabbitmq.Extensions;

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

@ -13,7 +13,6 @@ namespace CleanArchitecture.Domain.Rabbitmq;
public sealed class RabbitMqHandler : BackgroundService public sealed class RabbitMqHandler : BackgroundService
{ {
private IChannel? _channel;
private readonly RabbitMqConfiguration _configuration; private readonly RabbitMqConfiguration _configuration;
private readonly ConcurrentDictionary<string, List<ConsumeEventHandler>> _consumers = new(); private readonly ConcurrentDictionary<string, List<ConsumeEventHandler>> _consumers = new();
@ -21,6 +20,7 @@ public sealed class RabbitMqHandler : BackgroundService
private readonly ILogger<RabbitMqHandler> _logger; private readonly ILogger<RabbitMqHandler> _logger;
private readonly ConcurrentQueue<IRabbitMqAction> _pendingActions = new(); private readonly ConcurrentQueue<IRabbitMqAction> _pendingActions = new();
private IChannel? _channel;
public RabbitMqHandler( public RabbitMqHandler(
RabbitMqConfiguration configuration, RabbitMqConfiguration configuration,
@ -46,7 +46,7 @@ public sealed class RabbitMqHandler : BackgroundService
HostName = _configuration.Host, HostName = _configuration.Host,
Port = _configuration.Port, Port = _configuration.Port,
UserName = _configuration.Username, UserName = _configuration.Username,
Password = _configuration.Password, Password = _configuration.Password
}; };
var connection = await factory.CreateConnectionAsync(cancellationToken); var connection = await factory.CreateConnectionAsync(cancellationToken);
@ -133,14 +133,15 @@ public sealed class RabbitMqHandler : BackgroundService
AddExchangeConsumer(exchange, string.Empty, queue, consumer); AddExchangeConsumer(exchange, string.Empty, queue, consumer);
} }
private async Task AddEventConsumer(string exchange, string queueName, string routingKey, ConsumeEventHandler consumer) private async Task AddEventConsumer(string exchange, string queueName, string routingKey,
ConsumeEventHandler consumer)
{ {
if (!_configuration.Enabled) if (!_configuration.Enabled)
{ {
_logger.LogInformation("RabbitMQ is disabled. Event consumer will not be added."); _logger.LogInformation("RabbitMQ is disabled. Event consumer will not be added.");
return; return;
} }
var key = $"{exchange}-{routingKey}"; var key = $"{exchange}-{routingKey}";
if (!_consumers.TryGetValue(key, out var consumers)) if (!_consumers.TryGetValue(key, out var consumers))

10
CleanArchitecture.ServiceDefaults/Extensions.cs
View File

@ -34,10 +34,7 @@ public static class Extensions
http.AddServiceDiscovery(); http.AddServiceDiscovery();
}); });
builder.Services.Configure<ServiceDiscoveryOptions>(options => builder.Services.Configure<ServiceDiscoveryOptions>(options => { options.AllowedSchemes = ["https"]; });
{
options.AllowedSchemes = ["https"];
});
} }
private static void ConfigureOpenTelemetry<TBuilder>(this TBuilder builder) where TBuilder : IHostApplicationBuilder private static void ConfigureOpenTelemetry<TBuilder>(this TBuilder builder) where TBuilder : IHostApplicationBuilder
@ -67,7 +64,8 @@ public static class Extensions
builder.AddOpenTelemetryExporters(); builder.AddOpenTelemetryExporters();
} }
private static void AddOpenTelemetryExporters<TBuilder>(this TBuilder builder) where TBuilder : IHostApplicationBuilder private static void AddOpenTelemetryExporters<TBuilder>(this TBuilder builder)
where TBuilder : IHostApplicationBuilder
{ {
var useOtlpExporter = !string.IsNullOrWhiteSpace(builder.Configuration["OTEL_EXPORTER_OTLP_ENDPOINT"]); var useOtlpExporter = !string.IsNullOrWhiteSpace(builder.Configuration["OTEL_EXPORTER_OTLP_ENDPOINT"]);
@ -100,4 +98,4 @@ public static class Extensions
}); });
} }
} }
} }