DotBased

@@ -1 +1 @@
-Subproject commit a3be0d96480892a6b2e13ebae30a636389373bbb
+Subproject commit 58739c2aeadc7e608359a20cd3ada2d447284c22

SharpRSS.Blazor/SharpRSS.Blazor.csproj

@@ -7,7 +7,6 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\DotBased\DotBased.Logging.MEL\DotBased.Logging.MEL.csproj" />
       <ProjectReference Include="..\SharpRSS.Business\SharpRSS.Business.csproj" />
       <ProjectReference Include="..\SharpRSS.Core\SharpRSS.Core.csproj" />
     </ItemGroup>

SharpRSS.Blazor/appsettings.Development.json

@@ -4,15 +4,53 @@
     "Server": "SQLite",
     "Connection": "Data Source=SRSS.db"
   },
+  "Serilog": {
+    "Using":  [ "Serilog.Sinks.Console", "Serilog.Sinks.File" ],
+    "MinimumLevel": {
+      "Default": "Debug",
+      "Override": {
+        "System": "Information",
+        "Microsoft": "Debug",
+        "Microsoft.Hosting.Lifetime": "Debug",
+        "Microsoft.AspNetCore": "Debug",
+        "Microsoft.AspNetCore.Authentication": "Debug"
+      }
+    },
+    "WriteTo": [
+      {
+        "Name": "Console",
+        "Args":
+        {
+          "outputTemplate": "[{Timestamp:HH:mm:ss} - {Caller}->{Assembly}] | {Level:u3}] {Message:lj}{NewLine}{Exception}"
+        }
+      },
+      {
+        "Name": "File",
+        "Args":
+        {
+          "path": "Logs/Debug/log_.log",
+          "RollingInterval": "Day",
+          "outputTemplate": "[{Timestamp:HH:mm:ss} - {Caller}->{Assembly}] | {Level:u3}] {Message:lj}{NewLine}{Exception}"
+        }
+      }
+    ],
+    "Destructure": [
+      { "Name": "ToMaximumDepth", "Args": { "maximumDestructuringDepth": 4 } },
+      { "Name": "ToMaximumStringLength", "Args": { "maximumStringLength": 100 } },
+      { "Name": "ToMaximumCollectionCount", "Args": { "maximumCollectionCount": 10 } }
+    ],
+    "Properties": {
+      "Application": "SharpRSS"
+    }
+  },
   "HTTP":
   {
     "HSTS":
     {
       "EnableHSTS": true,
-      "MaxAgeSeconds": 31536000,
+      "MaxAgeSeconds": 300,
       "IncludeSubdomains": true,
       "Preload": true
     }
-  },
+  }
-  "AllowedHosts": "*"
 }

SharpRSS.Blazor/appsettings.json

@@ -4,6 +4,45 @@
     "Server": "SQLite",
     "Connection": "Data Source=SRSS.db"
   },
+  "Serilog": {
+    "Using":  [ "Serilog.Sinks.Console", "Serilog.Sinks.File" ],
+    "MinimumLevel": {
+      "Default": "Information",
+      "Override": {
+        "System": "Information",
+        "Microsoft": "Information",
+        "Microsoft.Hosting.Lifetime": "Information",
+        "Microsoft.AspNetCore": "Warning",
+        "Microsoft.AspNetCore.Authentication": "Information"
+      }
+    },
+    "WriteTo": [
+      {
+        "Name": "Console",
+        "Args":
+        {
+          "outputTemplate": "[{Timestamp:HH:mm:ss} - {Caller}->{Assembly}] | {Level:u3}] {Message:lj}{NewLine}{Exception}"
+        }
+      },
+      {
+        "Name": "File",
+        "Args":
+        {
+          "path": "Logs/Debug/log_.log",
+          "RollingInterval": "Day",
+          "outputTemplate": "[{Timestamp:HH:mm:ss} - {Caller}->{Assembly}] | {Level:u3}] {Message:lj}{NewLine}{Exception}"
+        }
+      }
+    ],
+    "Destructure": [
+      { "Name": "ToMaximumDepth", "Args": { "maximumDestructuringDepth": 4 } },
+      { "Name": "ToMaximumStringLength", "Args": { "maximumStringLength": 100 } },
+      { "Name": "ToMaximumCollectionCount", "Args": { "maximumCollectionCount": 10 } }
+    ],
+    "Properties": {
+      "Application": "SharpRSS"
+    }
+  },
   "HTTP":
   {
     "HSTS":

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;
@@ -19,32 +19,16 @@ public static class DependencyInjection
     public static WebApplicationBuilder AddSRSS(this WebApplicationBuilder builder)
     {
         /*
-         * Logging
+         * Logging (serilog)
          */
-        LogService.Initialize(options =>
+        var serilogConfig = new LoggerConfiguration().ReadFrom.Configuration(builder.Configuration).UseBasedExtension();
-        {
+        Log.Logger = serilogConfig.CreateLogger();
-            options.Severity = LogSeverity.Verbose;
-            options.AddSeverityFilter("Microsoft", LogSeverity.Info);
-            options.AddSeverityFilter("Microsoft.Hosting.Lifetime", LogSeverity.Info);
-            options.AddSeverityFilter("Microsoft.AspNetCore", LogSeverity.Warning);
-            options.AddSeverityFilter("Microsoft.AspNetCore.Authentication", LogSeverity.Info);
-            options.AddSeverityFilter("MudBlazor", LogSeverity.Info);
-        });
-        Log.Logger = new LoggerConfiguration().UseBasedExtension()
-            .MinimumLevel.Verbose()
-            .Enrich.WithProperty("Application", "SharpRSS")
-            .WriteTo.Console(outputTemplate: BasedSerilog.OutputTemplate)
-            .WriteTo.File(path: Path.Combine("Logs", "Debug", "log_.log"), rollingInterval: RollingInterval.Day, outputTemplate: BasedSerilog.OutputTemplate)
-            .Destructure.ToMaximumDepth(4)
-            .Destructure.ToMaximumStringLength(100)
-            .Destructure.ToMaximumCollectionCount(10).CreateLogger();
         
         LogService.AddLogAdapter(new BasedSerilogAdapter(Log.Logger));
         var _logger = LogService.RegisterLogger(typeof(DependencyInjection));
         
         builder.Logging.ClearProviders();
-        builder.Logging.SetMinimumLevel(LogLevel.Trace);
+        builder.Logging.AddSerilog();
-        builder.Logging.AddDotBasedLoggerProvider(LogService.Options);
         
         /*
          * EF Core DbContextFactory

SharpRSS.Business/Services/AuthService.cs

@@ -1,6 +1,7 @@
 using DotBased;
 using DotBased.ASP.Auth.Domains;
 using DotBased.Logging;
+using SharpRSS.Data.Domains.Auth;
 
 namespace SharpRSS.Business.Services;
 
@@ -8,7 +9,7 @@ public class AuthService
 {
     public AuthService()
     {
-        _logger = LogService.RegisterLogger<AuthService>();
+        _logger = LogService.RegisterLogger(typeof(AuthService));
     }
 
     private readonly ILogger _logger;

SharpRSS.Business/SharpRSS.Business.csproj

@@ -8,7 +8,6 @@
 
     <ItemGroup>
       <ProjectReference Include="..\DotBased\DotBased.ASP.Auth\DotBased.ASP.Auth.csproj" />
-      <ProjectReference Include="..\DotBased\DotBased.Logging.MEL\DotBased.Logging.MEL.csproj" />
       <ProjectReference Include="..\DotBased\DotBased.Logging.Serilog\DotBased.Logging.Serilog.csproj" />
       <ProjectReference Include="..\DotBased\DotBased\DotBased.csproj" />
       <ProjectReference Include="..\SharpRSS.Core\SharpRSS.Core.csproj" />

SharpRSS.sln

@@ -19,8 +19,6 @@ 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
@@ -55,10 +53,6 @@ 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
@@ -70,6 +64,5 @@ 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