KamilH/ISEbd-21_Khaliullov_K_A_AntiAircraftGun_Base
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Доработка Лабораторной 7

Browse Source
This commit is contained in:
Kamil Haliullov 2022-12-23 13:00:54 +04:00
parent ca4aabd61c
commit 59af2cafbc
4 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AntiAircraftGun/AntiAircraftGun/AntiAircraftGun.csproj
View File

@ -13,7 +13,11 @@
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" /> <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" 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="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.Extensions.Logging" Version="3.1.0" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

14
AntiAircraftGun/AntiAircraftGun/Program.cs
View File

@ -1,6 +1,7 @@
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using NLog.Extensions.Logging; using Serilog;
namespace AntiAircraftGun namespace AntiAircraftGun
{ {
@ -27,8 +28,17 @@ namespace AntiAircraftGun
services.AddSingleton<FormMapWithSetAntiAircraftGuns>() services.AddSingleton<FormMapWithSetAntiAircraftGuns>()
.AddLogging(option => .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.SetMinimumLevel(LogLevel.Information);
option.AddNLog("nlog.config"); option.AddSerilog(logger);
}); });
} }
} }

2
AntiAircraftGun/AntiAircraftGun/SetAntiAircraftGunsGeneric.cs
View File

@ -62,7 +62,7 @@ namespace AntiAircraftGun
/// <returns></returns> /// <returns></returns>
public T Remove(int position) 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); if (_places[position] == null) throw new AntiAircraftGunNotFoundException(position);
T removed = _places[position]; T removed = _places[position];
_places.RemoveAt(position); _places.RemoveAt(position);

16
AntiAircraftGun/AntiAircraftGun/appsettings.json Normal file
View File

@ -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}"
}
}
]
}
}