diff --git a/ArmoredCar/ArmoredCar/ArmoredCar.csproj b/ArmoredCar/ArmoredCar/ArmoredCar.csproj index 13c6d49..6b703ef 100644 --- a/ArmoredCar/ArmoredCar/ArmoredCar.csproj +++ b/ArmoredCar/ArmoredCar/ArmoredCar.csproj @@ -7,21 +7,26 @@ - + - - Always + + Always + + + + - + + diff --git a/ArmoredCar/ArmoredCar/Program.cs b/ArmoredCar/ArmoredCar/Program.cs index 7cb09ae..f6eb61e 100644 --- a/ArmoredCar/ArmoredCar/Program.cs +++ b/ArmoredCar/ArmoredCar/Program.cs @@ -1,11 +1,10 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using NLog.Extensions.Logging; +using Microsoft.Extensions.Configuration; +using Serilog; using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using System.Windows.Forms; +using System.IO; namespace ArmoredCar { @@ -32,10 +31,23 @@ namespace ArmoredCar private static void ConfigureServices(ServiceCollection services) { services.AddSingleton() - .AddLogging(option => + .AddLogging(option => { + var configuration = new ConfigurationBuilder() + .SetBasePath(Directory.GetCurrentDirectory()) + .AddJsonFile(path: "appsettings.json", optional: false, reloadOnChange: true) + .Build(); + /*var logger = new LoggerConfiguration() + .MinimumLevel.Debug() + .WriteTo.File("log.txt", rollingInterval: RollingInterval.Day) + .CreateLogger();*/ + + var logger = new LoggerConfiguration() + .ReadFrom.Configuration(configuration) + .CreateLogger(); + option.SetMinimumLevel(LogLevel.Information); - option.AddNLog("nlog.config"); + option.AddSerilog(logger); }); } } diff --git a/ArmoredCar/ArmoredCar/appsettings.json b/ArmoredCar/ArmoredCar/appsettings.json new file mode 100644 index 0000000..aba9c90 --- /dev/null +++ b/ArmoredCar/ArmoredCar/appsettings.json @@ -0,0 +1,16 @@ +{ + "Serilog": { + "Using": [ "Serilog.Sinks.File" ], + "MinimumLevel": "Information", + "WriteTo": [ + { + "Name": "File", + "Args": { + "path": "armoredCar_log-.log", + "rollingInterval": "Day" + } + } + ], + "Enrich": [ "FromLogContext", "WithMachineName", "WithThreadId" ] + } +} \ No newline at end of file diff --git a/ArmoredCar/ArmoredCar/nlog.config b/ArmoredCar/ArmoredCar/nlog.config deleted file mode 100644 index c5c2976..0000000 --- a/ArmoredCar/ArmoredCar/nlog.config +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file