Move to Microsoft.Extensions.Logging

AcceptanceTest/ATApplication.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Microsoft.Extensions.Logging;
 using QuickFix;
 using QuickFix.Fields;
 
@@ -182,7 +183,8 @@ public void FromApp(Message message, SessionID sessionId)
             }
             catch (System.Exception e)
             {
-                Session.LookupSession(sessionId)?.Log.OnEvent($"Exception during FromApp: {e}\n while processing msg ({message})");
+                Session.LookupSession(sessionId)?.Log.Log(LogLevel.Error, e,
+                    "Exception during FromApp: {Error}\n while processing msg ({Message})", e, message);
             }
         }
 

AcceptanceTest/AcceptanceTest.csproj

@@ -19,6 +19,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
   </ItemGroup>
 
   <ItemGroup>

Examples/Executor/Examples.Executor.csproj

@@ -40,4 +40,9 @@
     </None>
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
+  </ItemGroup>
+
 </Project>

Examples/Executor/Program.cs

@@ -1,6 +1,6 @@
 using System;
+using Microsoft.Extensions.Logging;
 using QuickFix;
-using QuickFix.Logger;
 using QuickFix.Store;
 
 namespace Executor
@@ -27,9 +27,13 @@ static void Main(string[] args)
                 SessionSettings settings = new SessionSettings(args[0]);
                 IApplication executorApp = new Executor();
                 IMessageStoreFactory storeFactory = new FileStoreFactory(settings);
-                ILogFactory logFactory = new ScreenLogFactory(settings);
-                //ILogFactory logFactory = new FileLogFactory(settings);
-                ThreadedSocketAcceptor acceptor = new ThreadedSocketAcceptor(executorApp, storeFactory, settings, logFactory);
+                using var loggerFactory = LoggerFactory.Create(builder =>
+                {
+                    builder.SetMinimumLevel(LogLevel.Trace);
+                    builder.AddConsole();
+                });
+                ThreadedSocketAcceptor acceptor =
+                    new ThreadedSocketAcceptor(executorApp, storeFactory, settings, loggerFactory);
                 HttpServer srv = new HttpServer(HttpServerPrefix, settings);
 
                 acceptor.Start();

Examples/SimpleAcceptor/Examples.SimpleAcceptor.csproj

@@ -34,4 +34,9 @@
     </None>
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
+  </ItemGroup>
+
 </Project>

Examples/SimpleAcceptor/Program.cs

@@ -1,6 +1,6 @@
 using System;
+using Microsoft.Extensions.Logging;
 using QuickFix;
-using QuickFix.Logger;
 using QuickFix.Store;
 
 namespace SimpleAcceptor
@@ -30,8 +30,11 @@ static void Main(string[] args)
                 SessionSettings settings = new SessionSettings(args[0]);
                 IApplication app = new SimpleAcceptorApp();
                 IMessageStoreFactory storeFactory = new FileStoreFactory(settings);
-                ILogFactory logFactory = new FileLogFactory(settings);
-                IAcceptor acceptor = new ThreadedSocketAcceptor(app, storeFactory, settings, logFactory);
+                using var loggerFactory = LoggerFactory.Create(builder =>
+                {
+                    builder.AddConsole();
+                });
+                IAcceptor acceptor = new ThreadedSocketAcceptor(app, storeFactory, settings, loggerFactory);
 
                 acceptor.Start();
                 Console.WriteLine("press <enter> to quit");

Examples/Standalone/SerilogLog/AppSettings.cs

@@ -0,0 +1,6 @@
+namespace SerilogLog;
+
+public class AppSettings
+{
+    public required string ConfigFilePath { get; set; }
+}

Examples/Standalone/SerilogLog/FixBackgroundService.cs

@@ -0,0 +1,60 @@
+using Microsoft.Extensions.Options;
+using QuickFix;
+using QuickFix.Store;
+using QuickFix.Transport;
+
+namespace SerilogLog;
+
+public class FixBackgroundService(IOptions<AppSettings> appSettings, ILoggerFactory loggerFactory) : IHostedService, IApplication
+{
+    private SocketInitiator? _initiator;
+
+    public Task StartAsync(CancellationToken cancellationToken)
+    {
+        var settings = new SessionSettings(appSettings.Value.ConfigFilePath);
+
+        var storeFactory = new FileStoreFactory(settings);
+        _initiator = new SocketInitiator(
+            this,
+            storeFactory,
+            settings,
+            loggerFactory);
+
+        _initiator.Start();
+        return Task.CompletedTask;
+    }
+
+    public Task StopAsync(CancellationToken cancellationToken)
+    {
+        _initiator?.Stop();
+        return Task.CompletedTask;
+    }
+
+    public void ToAdmin(Message message, SessionID sessionId)
+    {
+    }
+
+    public void FromAdmin(Message message, SessionID sessionId)
+    {
+    }
+
+    public void ToApp(Message message, SessionID sessionId)
+    {
+    }
+
+    public void FromApp(Message message, SessionID sessionId)
+    {
+    }
+
+    public void OnCreate(SessionID sessionId)
+    {
+    }
+
+    public void OnLogout(SessionID sessionId)
+    {
+    }
+
+    public void OnLogon(SessionID sessionId)
+    {
+    }
+}

Examples/Standalone/SerilogLog/Program.cs

@@ -0,0 +1,74 @@
+using Serilog;
+using Serilog.Core;
+using Serilog.Filters;
+
+namespace SerilogLog;
+
+class Program
+{
+    static async Task Main(string[] args)
+    {
+        Log.Logger = new LoggerConfiguration()
+            .Enrich.FromLogContext()
+            .MinimumLevel.Debug()
+            .WriteTo.Console()
+            .WriteTo.Logger(l => l
+                .Filter
+                .ByIncludingOnly(Matching.FromSource("QuickFix.SessionLogs"))
+                .Filter
+                .ByIncludingOnly(Matching.WithProperty("MessageType"))
+                .WriteTo.Map(Constants.SourceContextPropertyName, "", (source, lc) =>
+                {
+                    var fileName = GetSessionIdFromSourceContext(source);
+                    lc.File($"log/{fileName}.messages.log", rollingInterval: RollingInterval.Minute, outputTemplate:"{Message:lj}{NewLine}");
+                })
+            )
+            .WriteTo.Logger(l => l
+                .Filter
+                .ByIncludingOnly(Matching.FromSource("QuickFix.SessionLogs"))
+                .Filter
+                .ByExcluding(Matching.WithProperty("MessageType"))
+                .WriteTo.Map(Constants.SourceContextPropertyName, "", (source, lc) =>
+                {
+                    var fileName = GetSessionIdFromSourceContext(source);
+                    lc.File($"log/{fileName}.event.log", rollingInterval: RollingInterval.Minute, outputTemplate:"{Message:lj}{NewLine}");
+                })
+            )
+            .WriteTo.Logger(l => l
+                .Filter
+                .ByIncludingOnly(Matching.FromSource("QuickFix"))
+                .Filter
+                .ByExcluding(Matching.FromSource("QuickFix.SessionLogs"))
+                .WriteTo.File("log/Non-Session-Log.event.current.log")
+            )
+            .CreateLogger();
+
+        try
+        {
+            Log.Information("Starting host");
+
+            var builder = Host.CreateApplicationBuilder(args);
+            builder.Services.AddHostedService<FixBackgroundService>();
+            builder.Services.AddSerilog();
+            builder.Services.Configure<AppSettings>(builder.Configuration);
+            var app = builder.Build();
+
+            await app.RunAsync();
+        }
+        catch (Exception ex)
+        {
+            Log.Fatal(ex, "Host terminated unexpectedly");
+        }
+        finally
+        {
+            await Log.CloseAndFlushAsync();
+        }
+    }
+
+    private static string GetSessionIdFromSourceContext(string sourceContext)
+    {
+        // Log source is "QuickFix.SessionLogs.<session-id>", this returns <session-id>
+        var i = sourceContext.IndexOf('.', sourceContext.IndexOf('.') + 1) + 1;
+        return sourceContext[i..];
+    }
+}

Examples/Standalone/SerilogLog/Serilog.cfg

@@ -0,0 +1,33 @@
+[DEFAULT]
+ConnectionType=initiator
+ReconnectInterval=2
+FileStorePath=store
+StartTime=00:00:00
+EndTime=00:00:00
+UseDataDictionary=Y
+SocketConnectHost=127.0.0.1
+SocketConnectPort=5001
+SocketIgnoreProxy=Y
+ResetOnDisconnect=Y
+FileLogPath=log
+LogoutTimeout=5
+ResetOnLogon=Y
+HeartBtInt=10
+
+[SESSION]
+BeginString=FIX.4.0
+SenderCompID=CLIENT1
+TargetCompID=EXECUTOR
+DataDictionary=../../../spec/fix/FIX40.xml
+
+[SESSION]
+BeginString=FIX.4.4
+SenderCompID=CLIENT1
+TargetCompID=EXECUTOR
+DataDictionary=../../../spec/fix/FIX44.xml
+
+[SESSION]
+BeginString=FIX.4.4
+SenderCompID=CLIENT2
+TargetCompID=EXECUTOR
+DataDictionary=../../../spec/fix/FIX44.xml