From 4d7de8d19c782d8dba2a94578c75b809a7606ea2 Mon Sep 17 00:00:00 2001
From: antoc0der <1@DESKTOP-K1L8ND3>
Date: Wed, 6 Dec 2023 19:45:41 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B9=D0=BE=D1=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectAirplaneWithRadar/AppSettings.json | 20 +++++++++++
 .../ProjectAirplaneWithRadar/Program.cs       | 33 ++++++++++++++-----
 .../ProjectAirplaneWithRadar.csproj           | 10 ++++++
 3 files changed, 55 insertions(+), 8 deletions(-)
 create mode 100644 ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/AppSettings.json

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<FormAirplanesCollection>());
+            }
+        }
+        private static void ConfigureServices(ServiceCollection services)
+        {
+            services.AddSingleton<FormAirplanesCollection>().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 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
     <PackageReference Include="NLog.Extensions.Logging" Version="5.3.5" />
     <PackageReference Include="Serilog" Version="3.1.1" />
+    <PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="AppSettings.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>
\ No newline at end of file