From 3722bd1a83bf9f004ece637e494271afcec1b037 Mon Sep 17 00:00:00 2001 From: max Date: Sat, 30 Nov 2024 19:10:30 +0100 Subject: [PATCH] [UPDATE] Updated submodule & logging update --- SharpRSS.Blazor/SharpRSS.Blazor.csproj | 1 + SharpRSS.Business/DependencyInjection.cs | 4 ++-- SharpRSS.Business/Services/AuthService.cs | 3 +-- SharpRSS.Business/SharpRSS.Business.csproj | 1 + SharpRSS.sln | 7 +++++++ 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/SharpRSS.Blazor/SharpRSS.Blazor.csproj b/SharpRSS.Blazor/SharpRSS.Blazor.csproj index 49a83a5..ed65a4b 100644 --- a/SharpRSS.Blazor/SharpRSS.Blazor.csproj +++ b/SharpRSS.Blazor/SharpRSS.Blazor.csproj @@ -7,6 +7,7 @@ + diff --git a/SharpRSS.Business/DependencyInjection.cs b/SharpRSS.Business/DependencyInjection.cs index b6ab115..977b0ad 100644 --- a/SharpRSS.Business/DependencyInjection.cs +++ b/SharpRSS.Business/DependencyInjection.cs @@ -1,6 +1,6 @@ -using DotBased.ASP.Auth; using DotBased.Logging; using DotBased.Logging.Serilog; +using DotBased.Logging.MEL; using Microsoft.AspNetCore.Builder; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; @@ -28,7 +28,7 @@ public static class DependencyInjection var _logger = LogService.RegisterLogger(typeof(DependencyInjection)); builder.Logging.ClearProviders(); - builder.Logging.AddSerilog(); + builder.Logging.AddDotBasedLoggerProvider(LogService.Options); /* * EF Core DbContextFactory diff --git a/SharpRSS.Business/Services/AuthService.cs b/SharpRSS.Business/Services/AuthService.cs index 97f57f9..226019c 100644 --- a/SharpRSS.Business/Services/AuthService.cs +++ b/SharpRSS.Business/Services/AuthService.cs @@ -1,7 +1,6 @@ using DotBased; using DotBased.ASP.Auth.Domains; using DotBased.Logging; -using SharpRSS.Data.Domains.Auth; namespace SharpRSS.Business.Services; @@ -9,7 +8,7 @@ public class AuthService { public AuthService() { - _logger = LogService.RegisterLogger(typeof(AuthService)); + _logger = LogService.RegisterLogger(); } private readonly ILogger _logger; diff --git a/SharpRSS.Business/SharpRSS.Business.csproj b/SharpRSS.Business/SharpRSS.Business.csproj index 0005ffc..632fc42 100644 --- a/SharpRSS.Business/SharpRSS.Business.csproj +++ b/SharpRSS.Business/SharpRSS.Business.csproj @@ -8,6 +8,7 @@ + diff --git a/SharpRSS.sln b/SharpRSS.sln index bc27ca7..37020eb 100755 --- a/SharpRSS.sln +++ b/SharpRSS.sln @@ -19,6 +19,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotBased.Logging.Serilog", EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotBased.ASP.Auth", "DotBased\DotBased.ASP.Auth\DotBased.ASP.Auth.csproj", "{18CEAA37-B46A-4543-9E7B-5BF12CFF9172}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotBased.Logging.MEL", "DotBased\DotBased.Logging.MEL\DotBased.Logging.MEL.csproj", "{BDE9E9B4-4665-4EA6-BF4E-2341F0E0529E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -53,6 +55,10 @@ Global {18CEAA37-B46A-4543-9E7B-5BF12CFF9172}.Debug|Any CPU.Build.0 = Debug|Any CPU {18CEAA37-B46A-4543-9E7B-5BF12CFF9172}.Release|Any CPU.ActiveCfg = Release|Any CPU {18CEAA37-B46A-4543-9E7B-5BF12CFF9172}.Release|Any CPU.Build.0 = Release|Any CPU + {BDE9E9B4-4665-4EA6-BF4E-2341F0E0529E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BDE9E9B4-4665-4EA6-BF4E-2341F0E0529E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BDE9E9B4-4665-4EA6-BF4E-2341F0E0529E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BDE9E9B4-4665-4EA6-BF4E-2341F0E0529E}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -64,5 +70,6 @@ Global {F2BA5122-C9EE-4E65-B3EF-987D797AEAB0} = {A73E4832-235F-4032-825E-3A928199A5DF} {49F07625-B92C-439B-AC3E-7DEB26EA15D4} = {A73E4832-235F-4032-825E-3A928199A5DF} {18CEAA37-B46A-4543-9E7B-5BF12CFF9172} = {A73E4832-235F-4032-825E-3A928199A5DF} + {BDE9E9B4-4665-4EA6-BF4E-2341F0E0529E} = {A73E4832-235F-4032-825E-3A928199A5DF} EndGlobalSection EndGlobal