diff --git a/CallbackHandler.BusinessLogic.Tests/CallbackHandler.BusinessLogic.Tests.csproj b/CallbackHandler.BusinessLogic.Tests/CallbackHandler.BusinessLogic.Tests.csproj index 65d020d..ddf36d8 100644 --- a/CallbackHandler.BusinessLogic.Tests/CallbackHandler.BusinessLogic.Tests.csproj +++ b/CallbackHandler.BusinessLogic.Tests/CallbackHandler.BusinessLogic.Tests.csproj @@ -9,7 +9,7 @@ - + diff --git a/CallbackHandler.BusinessLogic/CallbackHandler.BusinessLogic.csproj b/CallbackHandler.BusinessLogic/CallbackHandler.BusinessLogic.csproj index d8ebd4f..caf8deb 100644 --- a/CallbackHandler.BusinessLogic/CallbackHandler.BusinessLogic.csproj +++ b/CallbackHandler.BusinessLogic/CallbackHandler.BusinessLogic.csproj @@ -5,9 +5,9 @@ - - - + + + diff --git a/CallbackHandler.CallbackMessage.DomainEvents/CallbackHandler.CallbackMessage.DomainEvents.csproj b/CallbackHandler.CallbackMessage.DomainEvents/CallbackHandler.CallbackMessage.DomainEvents.csproj index 6c0dd87..46a48dd 100644 --- a/CallbackHandler.CallbackMessage.DomainEvents/CallbackHandler.CallbackMessage.DomainEvents.csproj +++ b/CallbackHandler.CallbackMessage.DomainEvents/CallbackHandler.CallbackMessage.DomainEvents.csproj @@ -5,7 +5,7 @@ None - - + + \ No newline at end of file diff --git a/CallbackHandler.CallbackMessageAggregate.Tests/CallbackHandler.CallbackMessageAggregate.Tests.csproj b/CallbackHandler.CallbackMessageAggregate.Tests/CallbackHandler.CallbackMessageAggregate.Tests.csproj index 637aa8f..33ee18c 100644 --- a/CallbackHandler.CallbackMessageAggregate.Tests/CallbackHandler.CallbackMessageAggregate.Tests.csproj +++ b/CallbackHandler.CallbackMessageAggregate.Tests/CallbackHandler.CallbackMessageAggregate.Tests.csproj @@ -8,7 +8,7 @@ - + diff --git a/CallbackHandler.CallbackMessageAggregate/CallbackHandler.CallbackMessageAggregate.csproj b/CallbackHandler.CallbackMessageAggregate/CallbackHandler.CallbackMessageAggregate.csproj index 5feb8b7..a46de59 100644 --- a/CallbackHandler.CallbackMessageAggregate/CallbackHandler.CallbackMessageAggregate.csproj +++ b/CallbackHandler.CallbackMessageAggregate/CallbackHandler.CallbackMessageAggregate.csproj @@ -10,8 +10,8 @@ - - - + + + \ No newline at end of file diff --git a/CallbackHandler.Tests/CallbackHandler.Tests.csproj b/CallbackHandler.Tests/CallbackHandler.Tests.csproj index 013c9e3..0dea5df 100644 --- a/CallbackHandler.Tests/CallbackHandler.Tests.csproj +++ b/CallbackHandler.Tests/CallbackHandler.Tests.csproj @@ -9,7 +9,7 @@ - + diff --git a/CallbackHandler/CallbackHandler.csproj b/CallbackHandler/CallbackHandler.csproj index 2aaf4f0..a2aaddb 100644 --- a/CallbackHandler/CallbackHandler.csproj +++ b/CallbackHandler/CallbackHandler.csproj @@ -8,11 +8,11 @@ - + - + @@ -33,9 +33,6 @@ Always - - Always - diff --git a/CallbackHandler/Program.cs b/CallbackHandler/Program.cs index 94241c8..763aae1 100644 --- a/CallbackHandler/Program.cs +++ b/CallbackHandler/Program.cs @@ -6,15 +6,19 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using NLog.Extensions.Logging; +using Shared.Logger; +using Shared.Middleware; namespace CallbackHandler { - using System.Diagnostics.CodeAnalysis; - using System.IO; using Lamar.Microsoft.DependencyInjection; using Microsoft.Extensions.DependencyInjection; + using NLog; using Shared.DomainDrivenDesign.EventSourcing; using Shared.EventStore.Aggregate; + using System.Diagnostics.CodeAnalysis; + using System.IO; [ExcludeFromCodeCoverage] public class Program @@ -34,12 +38,28 @@ public static IHostBuilder CreateHostBuilder(string[] args) .AddJsonFile("hosting.development.json", optional: true) .AddEnvironmentVariables().Build(); + String contentRoot = Directory.GetCurrentDirectory(); + String nlogConfigPath = Path.Combine(contentRoot, "nlog.config"); + + LogManager.Setup(b => + { + b.SetupLogFactory(setup => + { + setup.AddCallSiteHiddenAssembly(typeof(NlogLogger).Assembly); + setup.AddCallSiteHiddenAssembly(typeof(Shared.Logger.Logger).Assembly); + setup.AddCallSiteHiddenAssembly(typeof(TenantMiddleware).Assembly); + }); + b.LoadConfigurationFromFile(nlogConfigPath); + }); + + IHostBuilder hostBuilder = Host.CreateDefaultBuilder(args); hostBuilder.UseWindowsService(); hostBuilder.UseLamar(); hostBuilder.ConfigureLogging(logging => { logging.AddConsole(); + logging.AddNLog(); }); hostBuilder.ConfigureWebHostDefaults(webBuilder => diff --git a/CallbackHandler/Startup.cs b/CallbackHandler/Startup.cs index 24c958a..7443f60 100644 --- a/CallbackHandler/Startup.cs +++ b/CallbackHandler/Startup.cs @@ -10,10 +10,6 @@ namespace CallbackHandler { - using System.Diagnostics.CodeAnalysis; - using System.IO; - using System.Net.Http; - using System.Reflection; using Bootstrapper; using BusinessLogic.Common; using BusinessLogic.RequestHandler; @@ -37,7 +33,12 @@ namespace CallbackHandler using Shared.Extensions; using Shared.General; using Shared.Logger; + using Shared.Middleware; using Swashbuckle.AspNetCore.Filters; + using System.Diagnostics.CodeAnalysis; + using System.IO; + using System.Net.Http; + using System.Reflection; using ILogger = Microsoft.Extensions.Logging.ILogger; [ExcludeFromCodeCoverage] @@ -92,28 +93,18 @@ public void ConfigureContainer(ServiceRegistry services) // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) { - String nlogConfigFilename = "nlog.config"; - if (env.IsDevelopment()) { - var developmentNlogConfigFilename = "nlog.development.config"; - if (File.Exists(Path.Combine(env.ContentRootPath, developmentNlogConfigFilename))) - { - nlogConfigFilename = developmentNlogConfigFilename; - } app.UseDeveloperExceptionPage(); } - - loggerFactory.ConfigureNLog(Path.Combine(env.ContentRootPath, nlogConfigFilename)); - loggerFactory.AddNLog(); - + ILogger logger = loggerFactory.CreateLogger("CallbackHandler"); Logger.Initialise(logger); Startup.Configuration.LogConfiguration(Logger.LogWarning); ConfigurationReader.Initialise(Startup.Configuration); - + app.UseMiddleware(); app.AddRequestLogging(); app.AddResponseLogging(); app.AddExceptionHandler(); diff --git a/CallbackHandler/nlog.config b/CallbackHandler/nlog.config index 0e90501..e223e44 100644 --- a/CallbackHandler/nlog.config +++ b/CallbackHandler/nlog.config @@ -5,7 +5,7 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file