diff --git a/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/AppSettings.json b/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/AppSettings.json new file mode 100644 index 0000000..5646190 --- /dev/null +++ b/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/AppSettings.json @@ -0,0 +1,20 @@ +{ + "Serilog": { + "Using": [ "Serilog.Sinks.File" ], + "MinimumLevel": "Information", + "WriteTo": [ + { + "Name": "File", + "Args": { + "path": "Logs/log_.log", + "rollingInterval": "Day", + "outputTemplate": "[{Timestamp:HH:mm:ss.fff}]{Level:u4}: {Message:lj}{NewLine}{Exception}" + } + } + ], + "Enrich": [ "FromLogContext", "WithMachineName", "WithThreadId" ], + "Properties": { + "Application": "ProjectAirplaneWithRadar" + } + } +} diff --git a/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/Program.cs b/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/Program.cs index 9c683fe..26458bc 100644 --- a/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/Program.cs +++ b/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/Program.cs @@ -1,7 +1,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using NLog.Extensions.Logging; - +using Microsoft.Extensions.Configuration; using System; using System.Collections.Generic; using System.Drawing; @@ -11,6 +11,7 @@ using System.Windows.Forms; using Serilog; using Serilog.Events; using Serilog.Formatting.Json; +using Serilog.Configuration; //using Microsoft.VisualBasic.Logging; namespace ProjectAirplaneWithRadar @@ -23,14 +24,30 @@ namespace ProjectAirplaneWithRadar [STAThread] static void Main() { - Log.Logger = new LoggerConfiguration() - .WriteTo.File("log.txt") - .MinimumLevel.Debug() - .CreateLogger(); - // To customize application configuration such as set high DPI settings or default font, - // see https://aka.ms/applicationconfiguration. ApplicationConfiguration.Initialize(); - Application.Run(new FormAirplanesCollection()); + //Application.Run(new FormAirplanesCollection()); + var services = new ServiceCollection(); + ConfigureServices(services); + using (ServiceProvider serviceProvider = services.BuildServiceProvider()) + { + Application.Run(serviceProvider.GetRequiredService()); + } + } + private static void ConfigureServices(ServiceCollection services) + { + services.AddSingleton().AddLogging(option => + { + string[] path = Directory.GetCurrentDirectory().Split('\\'); + string pathNeed = ""; + for (int i = 0; i < path.Length - 3; i++) + { + pathNeed += path[i] + "\\"; + } + var configuration = new ConfigurationBuilder().SetBasePath(Directory.GetCurrentDirectory()).AddJsonFile(path: $"{pathNeed}appsettings.json", optional: false, reloadOnChange: true).Build(); + var logger = new LoggerConfiguration().ReadFrom.Configuration(configuration).CreateLogger(); + option.SetMinimumLevel(LogLevel.Information); + option.AddSerilog(logger); + }); } } } \ No newline at end of file diff --git a/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar.csproj b/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar.csproj index 2028c8e..f9fd00b 100644 --- a/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar.csproj +++ b/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar.csproj @@ -9,10 +9,20 @@ + + + + + + + Always + + + \ No newline at end of file