Log to MS logging (in service) when logging to serilog

Author: webprofusion-chrisc

src/Certify.Core/Certify.Core.csproj

@@ -53,6 +53,8 @@
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="Polly" Version="8.5.1" />
+        <PackageReference Include="Serilog.Extensions.Logging" Version="9.0.0" />
+        <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
     </ItemGroup>
 
     <ItemGroup>

src/Certify.Core/Management/CertifyManager/CertifyManager.cs

@@ -381,10 +381,11 @@ private void InitLogging(Shared.ServiceConfig serverConfig)
             var serilogLog = new Serilog.LoggerConfiguration()
                .Enrich.FromLogContext()
                .MinimumLevel.ControlledBy(ManagedCertificateLog.LogLevelSwitchFromLogLevel(_loggingLevelSwitch))
+               .WriteTo.Console()
                .WriteTo.File(Path.Combine(EnvironmentUtil.CreateAppDataPath("logs"), "session.log"), shared: true, flushToDiskInterval: new TimeSpan(0, 0, 10), rollOnFileSizeLimit: true, fileSizeLimitBytes: 5 * 1024 * 1024)
                .CreateLogger();
 
-            var msLogger = new Serilog.Extensions.Logging.SerilogLoggerFactory(serilogLog).CreateLogger<ManagedCertificate>();
+            var msLogger = new Serilog.Extensions.Logging.SerilogLoggerFactory(serilogLog).CreateLogger<CertifyManager>();
 
             _serviceLog = new Loggy(msLogger);
 

src/Certify.Core/Management/CertifyManager/ICertifyManager.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Threading.Tasks;

src/Certify.Server/Certify.Server.HubService/Certify.Server.HubService.csproj

@@ -14,6 +14,7 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.1" />
+        <PackageReference Include="Serilog.Extensions.Logging" Version="9.0.0" />
 
         <!-- included to prevent conflict with older versions in plugins-->
         <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="9.0.1" />

src/Certify.Server/Certify.Server.HubService/Program.cs

@@ -1,4 +1,5 @@
 using Certify.Client;
+using Certify.Management;
 using Certify.Server.Hub.Api.Middleware;
 using Certify.Server.Hub.Api.Services;
 using Certify.Server.Hub.Api.SignalR;
@@ -7,6 +8,7 @@
 using Microsoft.AspNetCore.Mvc.ApplicationParts;
 using Microsoft.AspNetCore.SignalR;
 using Microsoft.AspNetCore.StaticFiles;
+using Serilog;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -39,11 +41,11 @@
 // Learn more about configuring OpenAPI at https://aka.ms/aspnet/openapi
 builder.Services.AddOpenApi();
 
-var certifyManager = new Certify.Management.CertifyManager();
-await certifyManager.Init();
+builder.Services.AddLogging(loggingBuilder =>
+        loggingBuilder.AddSerilog(dispose: true));
 
 // setup public/hub api
-builder.Services.AddSingleton<Certify.Management.ICertifyManager>(certifyManager);
+builder.Services.AddSingleton<Certify.Management.ICertifyManager, Certify.Management.CertifyManager>();
 
 builder.Services.AddTransient(typeof(ICertifyInternalApiClient), typeof(CertifyHubService));
 
@@ -114,7 +116,11 @@
 
 // setup signalr message forwarding, message received from internal service will be resent to our connected clients via our own SignalR hub
 var statusReporting = new UserInterfaceStatusHubReporting(statusHubContext);
-//UserInterfaceStatusHubReporting _statusReporting = new UserInterfaceStatusHubReporting();
+
+// wire up internal service to our hub
+
+var certifyManager = app.Services.GetRequiredService<ICertifyManager>();
+await certifyManager.Init();
 
 var directServerClient = app.Services.GetRequiredService<IManagementServerClient>();
 certifyManager.SetDirectManagementClient(directServerClient);