diff --git a/services/Archival/FilterLists.Archival.Api/Program.cs b/services/Archival/FilterLists.Archival.Api/Program.cs index c65f57179..43431a5ae 100644 --- a/services/Archival/FilterLists.Archival.Api/Program.cs +++ b/services/Archival/FilterLists.Archival.Api/Program.cs @@ -1,8 +1,7 @@ -using System.Threading.Tasks; +using System.Threading.Tasks; using FilterLists.Archival.Application; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Hosting; -using static FilterLists.SharedKernel.Logging.HostRunner; namespace FilterLists.Archival.Api { @@ -11,7 +10,7 @@ public static class Program public static async Task Main(string[] args) { var host = CreateHostBuilder(args).Build(); - await host.TryRunWithLoggingAsync(); + await host.RunAsync(); } public static IHostBuilder CreateHostBuilder(string[] args) diff --git a/services/Directory/FilterLists.Directory.Api/Program.cs b/services/Directory/FilterLists.Directory.Api/Program.cs index f5528dafd..aa333b1bc 100644 --- a/services/Directory/FilterLists.Directory.Api/Program.cs +++ b/services/Directory/FilterLists.Directory.Api/Program.cs @@ -1,9 +1,8 @@ -using System.Threading.Tasks; +using System.Threading.Tasks; using FilterLists.Directory.Application; using FilterLists.Directory.Infrastructure.Persistence; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Hosting; -using static FilterLists.SharedKernel.Logging.HostRunner; namespace FilterLists.Directory.Api { @@ -12,7 +11,8 @@ public static class Program public static async Task Main(string[] args) { var host = CreateHostBuilder(args).Build(); - await host.TryRunWithLoggingAsync(async () => await host.MigrateAsync()); + await host.MigrateAsync(); + await host.RunAsync(); } public static IHostBuilder CreateHostBuilder(string[] args) diff --git a/services/SharedKernel/FilterLists.SharedKernel.Logging/ConfigurationExtensions.cs b/services/SharedKernel/FilterLists.SharedKernel.Logging/ConfigurationExtensions.cs index 76ab48a6e..dbdec4ff9 100644 --- a/services/SharedKernel/FilterLists.SharedKernel.Logging/ConfigurationExtensions.cs +++ b/services/SharedKernel/FilterLists.SharedKernel.Logging/ConfigurationExtensions.cs @@ -1,6 +1,7 @@ using System; using FilterLists.SharedKernel.Logging.Options; using Microsoft.ApplicationInsights.Channel; +using Microsoft.ApplicationInsights.Extensibility; using Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.Configuration; @@ -14,7 +15,13 @@ public static class ConfigurationExtensions { public static IHostBuilder UseLogging(this IHostBuilder hostBuilder) { - return hostBuilder.UseSerilog(); + return hostBuilder.UseSerilog((_, services, __) => ConfigurationBuilder.BaseLoggerConfiguration + .WriteTo.Conditional( + ___ => services.GetService().IsProduction(), + c => c.ApplicationInsights( + services.GetRequiredService(), + TelemetryConverter.Traces)) + .WriteTo.Console()); } public static void AddSharedKernelLogging(this IServiceCollection services, IConfiguration configuration) diff --git a/services/SharedKernel/FilterLists.SharedKernel.Logging/HostRunner.cs b/services/SharedKernel/FilterLists.SharedKernel.Logging/HostRunner.cs deleted file mode 100644 index 7d467b99e..000000000 --- a/services/SharedKernel/FilterLists.SharedKernel.Logging/HostRunner.cs +++ /dev/null @@ -1,51 +0,0 @@ -using System; -using System.Threading.Tasks; -using Microsoft.ApplicationInsights; -using Microsoft.ApplicationInsights.Extensibility; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; -using Serilog; - -namespace FilterLists.SharedKernel.Logging -{ - public static class HostRunner - { - public static async Task TryRunWithLoggingAsync(this IHost host, Func? runPreHostAsync = default) - { - _ = host ?? throw new ArgumentNullException(nameof(host)); - - Log.Logger = ConfigurationBuilder.BaseLoggerConfiguration - .WriteTo.Conditional( - _ => host.Services.GetService().IsProduction(), - c => c.ApplicationInsights( - host.Services.GetRequiredService(), - TelemetryConverter.Traces)) - .CreateLogger(); - - try - { - // TODO: rm, for debugging - var client = host.Services.GetService(); - Log.Warning("Application Insights Instrumentation Key: {InstrumentationKey}", client.InstrumentationKey); - - if (runPreHostAsync != null) - { - Log.Information("Initializing pre-host"); - await runPreHostAsync(); - } - - Log.Information("Initializing host"); - await host.RunAsync(); - } - catch (Exception ex) - { - Log.Fatal(ex, "Host terminated unexpectedly"); - throw; - } - finally - { - Log.CloseAndFlush(); - } - } - } -}