Merge pull request #66 from sommmen/feature/multi-log-table-support

feat: Added multi-log table support

Author: mo-esmp

samples/SampleWebApp/Controllers/HomeController.cs

@@ -1,11 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using SampleWebApp.Models;
-using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace SampleWebApp.Controllers
 {

samples/SampleWebApp/Data/ApplicationDbContext.cs

@@ -1,8 +1,5 @@
 using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace SampleWebApp.Data
 {

samples/SampleWebApp/Models/ErrorViewModel.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace SampleWebApp.Models
 {
     public class ErrorViewModel

samples/SampleWebApp/Properties/launchSettings.json

@@ -1,12 +1,4 @@
-{
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:7501",
-      "sslPort": 44377
-    }
-  },
+{
   "profiles": {
     "IIS Express": {
       "commandName": "IISExpress",
@@ -17,12 +9,21 @@
     },
     "SampleWebApp": {
       "commandName": "Project",
-      "dotnetRunMessages": "true",
       "launchBrowser": true,
-      "applicationUrl": "https://localhost:5001;http://localhost:5000",
+      "launchUrl": "http://localhost:7501/serilog-ui",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-      }
+      },
+      "dotnetRunMessages": "true",
+      "applicationUrl": "http://localhost:44377;http://localhost:7501"
+    }
+  },
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:7501",
+      "sslPort": 44377
     }
   }
-}
+}

samples/SampleWebApp/Services/HostedServices/SecondLogDummyLogGeneratorBackgroundService.cs

@@ -0,0 +1,87 @@
+using System;
+using System.Diagnostics;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Hosting;
+using Serilog;
+using Serilog.Events;
+
+namespace SampleWebApp.Services.HostedServices;
+
+/// <summary>
+/// A background service that generates some dummy logs every 5 seconds.
+/// </summary>
+public class SecondLogDummyLogGeneratorBackgroundService : BackgroundService
+{
+    private readonly IConfiguration _configuration;
+
+    public SecondLogDummyLogGeneratorBackgroundService(IConfiguration configuration)
+    {
+        _configuration = configuration;
+    }
+
+    protected override async Task ExecuteAsync(CancellationToken stoppingToken)
+    {
+        // Create the logger
+        var logger = new LoggerConfiguration()
+            .ReadFrom
+            .Configuration(_configuration, "Serilog2")
+            .CreateLogger()
+            .ForContext<SecondLogDummyLogGeneratorBackgroundService>();
+
+        var rand = new Random();
+
+        // Lets not generate too much data per run.
+        const int limit = 10; 
+
+        var count = 0;
+        while (++count <= limit)
+        {
+            // Stop when the application is stopping.
+            stoppingToken.ThrowIfCancellationRequested();
+
+            // Get a random level
+            var level = (LogEventLevel) rand.NextInt64((long)LogEventLevel.Fatal + 1L);
+
+            // Get a random number
+            var n = rand.NextInt64(0, 101);
+
+            Exception exception = null;
+
+            if (level >= LogEventLevel.Error)
+            {
+                exception = GetException();
+            }
+
+            logger.Write(level, exception, "Here's a random value: {n}", n);
+
+            await Task.Delay(TimeSpan.FromSeconds(5), stoppingToken);
+        }
+
+    }
+
+    [DebuggerHidden]
+    private static Exception GetException()
+    {
+        try
+        {
+            throw new TestException();
+        }
+        catch (Exception e)
+        {
+            return e;
+        }
+    }
+
+    /// <summary>
+    /// Feel free to disable breaking on this exception in your debugger settings.
+    /// </summary>
+    private class TestException : Exception
+    {
+        public TestException() 
+            : base("This is a test exception.")
+        {
+        }
+    }
+}

samples/SampleWebApp/Startup.cs

@@ -9,6 +9,7 @@
 using Microsoft.IdentityModel.Tokens;
 using SampleWebApp.Authentication.Jwt;
 using SampleWebApp.Data;
+using SampleWebApp.Services.HostedServices;
 using Serilog.Ui.MsSqlServerProvider;
 using Serilog.Ui.Web;
 
@@ -39,9 +40,14 @@ public void ConfigureServices(IServiceCollection services)
             services.AddRazorPages();
 
             services.AddSerilogUi(options => options
-                .UseSqlServer(Configuration.GetConnectionString("DefaultConnection"), "Logs"));
+                .UseSqlServer(Configuration.GetConnectionString("DefaultConnection"), "Logs")
+                .UseSqlServer(Configuration.GetConnectionString("SecondLogConnection"), "Logs2")
+            );
 
             services.AddSwaggerGen();
+
+            // Generate some dummy logs
+            services.AddHostedService<SecondLogDummyLogGeneratorBackgroundService>();
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.

samples/SampleWebApp/appsettings.json

@@ -1,6 +1,7 @@
 {
   "ConnectionStrings": {
-    "DefaultConnection": "Server=(local);Database=aspnet-SampleWebApp-93B544DE-DDCF-47C1-AD8A-BC87C4D6B954;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True"
+    "DefaultConnection": "Server=(localdb)\\mssqllocaldb;Database=aspnet-SampleWebApp-93B544DE-DDCF-47C1-AD8A-BC87C4D6B954;Trusted_Connection=True;MultipleActiveResultSets=true",
+    "SecondLogConnection": "Server=(localdb)\\mssqllocaldb;Database=aspnet-SampleWebApp-93B544DE-DDCF-47C1-AD8A-BC87C4D6B954;Trusted_Connection=True;MultipleActiveResultSets=true"
   },
 
   "AllowedHosts": "*",
@@ -34,5 +35,22 @@
         }
       }
     ]
+  },
+  
+  "Serilog2": {
+    "Using": [ "Serilog.Sinks.MSSqlServer" ],
+    "MinimumLevel": "Debug",
+    "WriteTo": [
+      {
+        "Name": "MSSqlServer",
+        "Args": {
+          "connectionString": "SecondLogConnection",
+          "sinkOptionsSection": {
+            "tableName": "Logs2",
+            "autoCreateSqlTable": true
+          }
+        }
+      }
+    ]
   }
 }

src/Serilog.Ui.Core/AggregateDataProvider.cs

@@ -0,0 +1,72 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Serilog.Ui.Core.Services
+{
+    /// <summary>
+    /// Aggregates multiple <see cref="IDataProvider"/> into one instance.
+    /// </summary>
+    public class AggregateDataProvider : IDataProvider
+    {
+        /// <summary>
+        /// <inheritdoc cref="IDataProvider.Name"/>
+        /// NOTE We assume only one Aggregate provider, so the name is static.
+        /// </summary>
+        public string Name => nameof(AggregateDataProvider);
+
+        private IDataProvider _dataProvider;
+
+        /// <summary>
+        /// If there is only one data provider, this is it.
+        /// If there are multiple, this is the current data provider.
+        /// </summary>
+        public IDataProvider DataProvider => _dataProvider;
+
+        private readonly Dictionary<string, IDataProvider> _dataProviders = new Dictionary<string, IDataProvider>();
+        
+        public AggregateDataProvider(IEnumerable<IDataProvider> dataProviders)
+        {
+            if (dataProviders == null) throw new ArgumentNullException(nameof(dataProviders));
+
+            foreach (var grouped in dataProviders
+                         .GroupBy(c => c.Name, e => e, (k, e) => e.ToList()))
+            {
+                var name = grouped[0].Name;
+
+                if (grouped.Count == 1)
+                {
+                    _dataProviders.Add(name, grouped[0]);
+                }
+                else
+                {
+                    // When providers with the same name are registered, we ensure uniqueness by generating a key
+                    // I.e. ["MSSQL.dbo.logs", "MSSQL.dbo.logs"] => ["MSSQL.dbo.logs[0]", "MSSQL.dbo.logs[1]"]
+                    for (var i = 0; i < grouped.Count; i++)
+                    {
+                        var dataProvider = grouped[i];
+                        _dataProviders.Add($"{name}[{i}]", dataProvider);
+                    }
+                }
+            }
+
+            _dataProvider = _dataProviders.First(c => true).Value;
+        }
+
+        public void SwitchToProvider(string key)
+            => _dataProvider = _dataProviders[key];
+
+        public IEnumerable<string> Keys => _dataProviders.Keys;
+
+        #region Delegating members of IDataProvider
+
+        public async Task<(IEnumerable<LogModel>, int)> FetchDataAsync(int page, int count, string level = null, string searchCriteria = null, DateTime? startDate = null, DateTime? endDate = null)
+        {
+            return await DataProvider.FetchDataAsync(page, count, level, searchCriteria, startDate, endDate);
+        }
+
+        #endregion
+
+    }
+}

src/Serilog.Ui.Core/Extensions/RelationalDbOptionsExtensions.cs

@@ -0,0 +1,8 @@
+namespace Serilog.Ui.Core.Extensions
+{
+    public static class RelationalDbOptionsExtensions
+    {
+        public static string ToDataProviderName(this RelationalDbOptions options, string providerName)
+            => string.Join(".", providerName, options.Schema, options.TableName);
+    }
+}

src/Serilog.Ui.Core/IDataProvider.cs

@@ -27,5 +27,10 @@ public interface IDataProvider
             DateTime? startDate = null,
             DateTime? endDate = null
         );
+
+        /// <summary>
+        /// Name of the provider, used to identify this provider when using multiple.
+        /// </summary>
+        string Name { get; }
     }
-}
+}