From 59af2cafbc8a69cdc7442913f9d6c79f6a6dcf24 Mon Sep 17 00:00:00 2001
From: Kamil Haliullov <happywillskamil@gmail.com>
Date: Fri, 23 Dec 2022 13:00:54 +0400
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?=
 =?UTF-8?q?=D0=BA=D0=B0=20=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82=D0=BE?=
 =?UTF-8?q?=D1=80=D0=BD=D0=BE=D0=B9=207?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AntiAircraftGun/AntiAircraftGun.csproj       |  4 ++++
 AntiAircraftGun/AntiAircraftGun/Program.cs       | 14 ++++++++++++--
 .../SetAntiAircraftGunsGeneric.cs                |  2 +-
 AntiAircraftGun/AntiAircraftGun/appsettings.json | 16 ++++++++++++++++
 4 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 AntiAircraftGun/AntiAircraftGun/appsettings.json

diff --git a/AntiAircraftGun/AntiAircraftGun/AntiAircraftGun.csproj b/AntiAircraftGun/AntiAircraftGun/AntiAircraftGun.csproj
index 9eaef33..3483561 100644
--- a/AntiAircraftGun/AntiAircraftGun/AntiAircraftGun.csproj
+++ b/AntiAircraftGun/AntiAircraftGun/AntiAircraftGun.csproj
@@ -13,7 +13,11 @@
     <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
     <PackageReference Include="NLog.Extensions.Logging" Version="5.1.0" />
+    <PackageReference Include="Serilog" Version="2.12.0" />
+    <PackageReference Include="Serilog.AspNetCore" Version="6.0.1" />
+    <PackageReference Include="Serilog.Extensions.Hosting" Version="5.0.1" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/AntiAircraftGun/AntiAircraftGun/Program.cs b/AntiAircraftGun/AntiAircraftGun/Program.cs
index f03c116..cae20b9 100644
--- a/AntiAircraftGun/AntiAircraftGun/Program.cs
+++ b/AntiAircraftGun/AntiAircraftGun/Program.cs
@@ -1,6 +1,7 @@
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using NLog.Extensions.Logging;
+using Serilog;
 
 namespace AntiAircraftGun
 {
@@ -27,8 +28,17 @@ namespace AntiAircraftGun
             services.AddSingleton<FormMapWithSetAntiAircraftGuns>()
             .AddLogging(option =>
             {
+                var configuration = new ConfigurationBuilder()
+                    .SetBasePath(Directory.GetCurrentDirectory())
+                    .AddJsonFile(path: "appsettings.json", optional: false, reloadOnChange: true)
+                    .Build();
+
+                var logger = new LoggerConfiguration()
+                    .ReadFrom.Configuration(configuration)
+                    .CreateLogger();
+
                 option.SetMinimumLevel(LogLevel.Information);
-                option.AddNLog("nlog.config");
+                option.AddSerilog(logger);
             });
         }
     }
diff --git a/AntiAircraftGun/AntiAircraftGun/SetAntiAircraftGunsGeneric.cs b/AntiAircraftGun/AntiAircraftGun/SetAntiAircraftGunsGeneric.cs
index 29b3012..b5b0f68 100644
--- a/AntiAircraftGun/AntiAircraftGun/SetAntiAircraftGunsGeneric.cs
+++ b/AntiAircraftGun/AntiAircraftGun/SetAntiAircraftGunsGeneric.cs
@@ -62,7 +62,7 @@ namespace AntiAircraftGun
         /// <returns></returns>
         public T Remove(int position)
         {
-            if (position < 0 || position >= _places.Count) throw new AntiAircraftGunNotFoundException(position); ;
+            if (position >= _places.Count) throw new AntiAircraftGunNotFoundException(position);
             if (_places[position] == null) throw new AntiAircraftGunNotFoundException(position);
             T removed = _places[position];
             _places.RemoveAt(position);
diff --git a/AntiAircraftGun/AntiAircraftGun/appsettings.json b/AntiAircraftGun/AntiAircraftGun/appsettings.json
new file mode 100644
index 0000000..6e66299
--- /dev/null
+++ b/AntiAircraftGun/AntiAircraftGun/appsettings.json
@@ -0,0 +1,16 @@
+{
+  "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}"
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file