From 620d1efcb8daad1d8c343ed1b9f8d70cb299bd59 Mon Sep 17 00:00:00 2001 From: Haik Date: Wed, 27 Nov 2024 17:48:58 +0400 Subject: [PATCH] updated nuget packages --- Readme.md | 2 +- Shared.Kernel.Demo/Program.cs | 2 +- src/SharedKernel/Extensions/HealthCheckExtensions.cs | 1 + src/SharedKernel/Extensions/PandaVaultExtension.cs | 6 +++--- src/SharedKernel/Logging/SerilogExtension.cs | 12 +++++++++++- src/SharedKernel/SharedKernel.csproj | 8 ++++---- 6 files changed, 21 insertions(+), 10 deletions(-) diff --git a/Readme.md b/Readme.md index 991e083..de70cc6 100644 --- a/Readme.md +++ b/Readme.md @@ -128,7 +128,7 @@ builder.LogStartAttempt(); AssemblyRegistry.Add(typeof(Program).Assembly); builder - .AddPandaVault() + .ConfigureWithPandaVault() .AddSerilog() .AddResponseCrafter(NamingConvention.ToSnakeCase) .AddOpenApi() diff --git a/Shared.Kernel.Demo/Program.cs b/Shared.Kernel.Demo/Program.cs index dcc1c9d..4160911 100644 --- a/Shared.Kernel.Demo/Program.cs +++ b/Shared.Kernel.Demo/Program.cs @@ -17,7 +17,7 @@ AssemblyRegistry.Add(typeof(Program).Assembly); builder - // .AddPandaVault() + // .ConfigureWithPandaVault() .AddSerilog() .AddResponseCrafter(NamingConvention.ToSnakeCase) .AddOpenApi() diff --git a/src/SharedKernel/Extensions/HealthCheckExtensions.cs b/src/SharedKernel/Extensions/HealthCheckExtensions.cs index a4bab0f..34c408c 100644 --- a/src/SharedKernel/Extensions/HealthCheckExtensions.cs +++ b/src/SharedKernel/Extensions/HealthCheckExtensions.cs @@ -14,6 +14,7 @@ public static class HealthCheckExtensions public static WebApplication EnsureHealthy(this WebApplication app) { var healthCheckService = app.Services.GetRequiredService(); + var report = healthCheckService.CheckHealthAsync() .Result; diff --git a/src/SharedKernel/Extensions/PandaVaultExtension.cs b/src/SharedKernel/Extensions/PandaVaultExtension.cs index 32fc3cc..24c0c5b 100644 --- a/src/SharedKernel/Extensions/PandaVaultExtension.cs +++ b/src/SharedKernel/Extensions/PandaVaultExtension.cs @@ -1,15 +1,15 @@ using Microsoft.AspNetCore.Builder; -using PandaVaultClient; +using PandaVaultClient.Extensions; namespace SharedKernel.Extensions; public static class PandaVaultExtension { - public static WebApplicationBuilder AddPandaVault(this WebApplicationBuilder builder) + public static WebApplicationBuilder ConfigureWithPandaVault(this WebApplicationBuilder builder) { if (!builder.Environment.IsLocal()) { - builder.Configuration.AddPandaVault(); + builder.AddPandaVault(); } return builder; diff --git a/src/SharedKernel/Logging/SerilogExtension.cs b/src/SharedKernel/Logging/SerilogExtension.cs index f7117b2..edb3c43 100644 --- a/src/SharedKernel/Logging/SerilogExtension.cs +++ b/src/SharedKernel/Logging/SerilogExtension.cs @@ -76,7 +76,9 @@ private static LoggerConfiguration FilterOutUnwantedLogs(this LoggerConfiguratio .Filter .ByExcluding(logEvent => logEvent.ShouldExcludeOutboxDbCommandLogs()) .Filter - .ByExcluding(logEvent => logEvent.ShouldExcludeSwaggerLogs()); + .ByExcluding(logEvent => logEvent.ShouldExcludeSwaggerLogs()) + .Filter + .ByExcluding(logEvent => logEvent.ShouldExcludeMassTransitHealthCheckLogs()); return loggerConfig; } @@ -105,6 +107,14 @@ private static bool ShouldExcludeSwaggerLogs(this LogEvent logEvent) ?.ToString() ?.Contains("/swagger") == true; } + + private static bool ShouldExcludeMassTransitHealthCheckLogs(this LogEvent logEvent) + { + var message = logEvent.RenderMessage(); + return message.Contains("Health check masstransit-bus") + && message.Contains("Unhealthy") + && message.Contains("Not ready: not started"); + } private static string GetLogsPath(this WebApplicationBuilder builder) { diff --git a/src/SharedKernel/SharedKernel.csproj b/src/SharedKernel/SharedKernel.csproj index 22fc592..299494b 100644 --- a/src/SharedKernel/SharedKernel.csproj +++ b/src/SharedKernel/SharedKernel.csproj @@ -8,7 +8,7 @@ Readme.md Pandatech MIT - 1.0.8 + 1.0.9 Pandatech.SharedKernel Pandatech Shared Kernel Library Pandatech, shared kernel, library, OpenAPI, Swagger, utilities, scalar @@ -29,7 +29,7 @@ - + @@ -48,10 +48,10 @@ - + - +