DotBased.Logging.MEL/BasedLogger.cs

@@ -4,7 +4,6 @@ namespace DotBased.Logging.MEL;
 
 public class BasedLogger : Microsoft.Extensions.Logging.ILogger
 {
-    private const string _messageTemplateKey = "{OriginalFormat}";
     public BasedLogger(ILogger logger)
     {
         basedLogger = logger;
@@ -23,26 +22,24 @@ public class BasedLogger : Microsoft.Extensions.Logging.ILogger
 
     private LogCapsule ConstructCapsule<TState>(LogSeverity severity, EventId eventId, TState state, Exception? exception, Func<TState, Exception?, string> formatter)
     {
+        //TODO: Extract parameters & format
         var msgTemplate = string.Empty;
-        List<object?> templateParams = [];
         if (state is IEnumerable<KeyValuePair<string, object>> stateEnum)
         {
             foreach (var prop in stateEnum)
             {
-                if (prop is { Key: _messageTemplateKey, Value: string propValueString })
+                if (prop is { Key: "{OriginalFormat}", Value: string propValueString })
                 {
                     msgTemplate = propValueString;
-                    continue;
                 }
-                templateParams.Add(prop.Value);
             }
         }
 
         return new LogCapsule()
         {
             Exception = exception,
-            Message = msgTemplate,
+            Message = formatter.Invoke(state, exception),
-            Parameters = templateParams.ToArray(),
+            Parameters = [],
             Severity = severity,
             TimeStamp = DateTime.Now,
             Logger = basedLogger as LoggerBase ?? throw new NullReferenceException(nameof(basedLogger))

DotBased.Logging.MEL/LoggerBuilderExtensions.cs

@@ -4,10 +4,11 @@ namespace DotBased.Logging.MEL;
 
 public static class LoggerBuilderExtensions
 {
-    public static void AddDotBasedLoggerProvider(this ILoggingBuilder builder, LogOptions options)
+    public static ILoggingBuilder AddDotBased(this ILoggingBuilder builder, LogOptions options)
     {
         if (builder == null)
             throw new ArgumentNullException(nameof(builder));
         builder.AddProvider(new BasedLoggerProvider(options));
+        return builder;
     }
 }

DotBased.Logging.Serilog/BasedSerilog.cs

@@ -7,7 +7,7 @@ public static class BasedSerilog
     /// <summary>
     /// Default output template with the extra properties that can be used for serilog sinks.
     /// </summary>
-    public const string OutputTemplate = "[{Timestamp:HH:mm:ss} {Level} - {LoggerName}] {Message:lj}{NewLine}{Exception}";
+    public const string OutputTemplate = "[{Timestamp:HH:mm:ss} {Level:u3} - {LoggerName}]{NewLine} {Message:lj}{NewLine}{Exception}";
     
     public static LoggerConfiguration UseBasedExtension(this LoggerConfiguration loggerConfiguration)
     {

DotBased/Logging/LogProcessor.cs

@@ -1,5 +1,3 @@
-using System.Collections.Concurrent;
-
 namespace DotBased.Logging;
 
 /// <summary>
@@ -9,16 +7,21 @@ public class LogProcessor : IDisposable
 {
     public LogProcessor()
     {
-        _canLog = true;
+        _processorQueue = new Queue<LogCapsule>();
-        _capsuleCollection = new BlockingCollection<LogCapsule>();
         IncomingLogHandlerEvent = IncomingLogHandler;
-        _processTask = Task.Factory.StartNew(ProcessLog);
+        _processorThread = new Thread(ProcessLog)
+        {
+            IsBackground = true,
+            Name = "Log processor thread (DotBased)"
+        };
+        _processorThread.Start();
     }
     public readonly Action<LogCapsule> IncomingLogHandlerEvent;
     public event EventHandler<LogCapsule>? LogProcessed;
-    private bool _canLog;
+    private readonly Queue<LogCapsule> _processorQueue;
-    private readonly BlockingCollection<LogCapsule> _capsuleCollection;
+    private readonly Thread _processorThread;
-    private readonly Task _processTask;
+    private readonly ManualResetEvent _threadSuspendEvent = new ManualResetEvent(false);
+    private readonly ManualResetEvent _threadShutdownEvent = new ManualResetEvent(false);
 
     /// <summary>
     /// Stop the LogProcessor
@@ -28,9 +31,9 @@ public class LogProcessor : IDisposable
     /// </remarks>
     public void Stop()
     {
-        _canLog = false;
+        _threadShutdownEvent.Set();
-        _capsuleCollection.CompleteAdding();
+        _threadSuspendEvent.Set();
-        _processTask.Wait();
+        _processorThread.Join();
     }
 
     public void Dispose()
@@ -40,31 +43,35 @@ public class LogProcessor : IDisposable
     
     private void IncomingLogHandler(LogCapsule e)
     {
-        if (!_canLog)
+        _processorQueue.Enqueue(e);
-            return;
+        // Check if the thread is running, if not wake up the thread.
-        if (!_capsuleCollection.TryAdd(e))
+        if (!_threadSuspendEvent.WaitOne(0))
-        {
+            _threadSuspendEvent.Set();
-            _canLog = false;
-        }
     }
 
     private void ProcessLog()
     {
         try
         {
-            while (!_capsuleCollection.IsCompleted)
+            while (true)
             {
-                if (_capsuleCollection.TryTake(out var capsule, Timeout.Infinite))
+                _threadSuspendEvent.WaitOne(Timeout.Infinite);
+            
+                if (_threadShutdownEvent.WaitOne(0))
+                    break;
+
+                if (_processorQueue.Count != 0)
                 {
+                    var capsule = _processorQueue.Dequeue();
                     if (!LogService.CanLog(LogService.Options.Severity, capsule.Severity))
                         continue;
                     if (LogService.FilterSeverityLog(capsule))
                         LogProcessed?.Invoke(this, capsule);
                 }
+                else
+                    _threadSuspendEvent.Reset();
             }
         }
-        catch (InvalidOperationException)
-        { }
         catch (Exception e)
         {
             // Write exception to the output
@@ -74,8 +81,7 @@ public class LogProcessor : IDisposable
             Console.ForegroundColor = ConsoleColor.Blue;
             Console.Write($"[{DateTime.Now}] ");
             Console.ForegroundColor = oldColor;
-            Console.WriteLine(
+            Console.WriteLine($"[{nameof(LogProcessor)} (DotBased)] Log processor thread failed! No logs are being processed!");
-                $"[{nameof(LogProcessor)} (DotBased)] Log processor thread failed! No logs are being processed!");
             Console.ForegroundColor = ConsoleColor.Red;
             Console.WriteLine(e);
             Console.ForegroundColor = ConsoleColor.Yellow;

TestWebApi/Program.cs

@@ -16,7 +16,7 @@ var serilogLogger = SetupSerilog();
 LogService.AddLogAdapter(new BasedSerilogAdapter(serilogLogger));
 
 builder.Logging.ClearProviders();
-builder.Logging.AddDotBasedLoggerProvider(LogService.Options);
+builder.Logging.AddDotBased(LogService.Options);
 
 // Add services to the container.
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
@@ -25,6 +25,8 @@ builder.Services.AddSwaggerGen();
 
 var app = builder.Build();
 
+
+
 // Configure the HTTP request pipeline.
 if (app.Environment.IsDevelopment())
 {

TestWebApi/Properties/launchSettings.json

@@ -1,41 +0,0 @@
-{
-  "$schema": "http://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:35507",
-      "sslPort": 44353
-    }
-  },
-  "profiles": {
-    "http": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "applicationUrl": "http://localhost:5044",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "https": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "applicationUrl": "https://localhost:7234;http://localhost:5044",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    }
-  }
-}

TestWebApi/appsettings.Development.json

@@ -1,3 +0,0 @@
-{
-  
-}

TestWebApi/appsettings.json

@@ -1,3 +0,0 @@
-{
-  "AllowedHosts": "*"
-}