Removed ClearProviders

RocketSurgeonsGuild · May 3, 2024 · 2762694 · 2762694
1 parent bcb6cdd
commit 2762694
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/src/Hosting/Conventions/SerilogHostingConvention.cs b/src/Hosting/Conventions/SerilogHostingConvention.cs
@@ -3,6 +3,7 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Rocket.Surgery.Conventions;
+using Rocket.Surgery.Conventions.Logging;
 using Rocket.Surgery.Hosting;
 using Rocket.Surgery.LaunchPad.Serilog;
 using Serilog;
@@ -63,12 +64,12 @@ public void Register(IConventionContext context, IHostApplicationBuilder builder
                 _options.PreserveStaticLogger,
                 _options.WriteToProviders
             );
-
-            if (context.Get<ILoggerFactory>() != null)
-                // ReSharper disable once NullableWarningSuppressionIsUsed
-                builder.Services.AddSingleton(context.Get<ILoggerFactory>()!);
         }
 
+        if (context.Get<ILoggerFactory>() != null)
+            // ReSharper disable once NullableWarningSuppressionIsUsed
+            builder.Services.AddSingleton(context.Get<ILoggerFactory>()!);
+
         if (_options.WriteToProviders) return;
 
         builder.OnHostStarting(
@@ -84,4 +85,4 @@ public void Register(IConventionContext context, IHostApplicationBuilder builder
                         )
         );
     }
-}
+}
diff --git a/src/Serilog/Conventions/ConfigureOptionsLoggingConvention.cs b/src/Serilog/Conventions/ConfigureOptionsLoggingConvention.cs
@@ -1,7 +1,9 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Rocket.Surgery.Conventions;
+using Rocket.Surgery.Conventions.Logging;
 using Serilog;
 
 namespace Rocket.Surgery.LaunchPad.Serilog.Conventions;
@@ -44,4 +46,5 @@ LoggerConfiguration loggerConfiguration
             post.PostConfigure(Options.DefaultName, loggerConfiguration);
         }
     }
-}
+}
+
diff --git a/src/Serilog/LaunchPadLoggingOptions.cs b/src/Serilog/LaunchPadLoggingOptions.cs
@@ -3,6 +3,7 @@ namespace Rocket.Surgery.LaunchPad.Serilog;
 /// <summary>
 ///     RocketSerilogOptions.
 /// </summary>
+[PublicAPI]
 public class LaunchPadLoggingOptions
 {
     /// <summary>
@@ -30,10 +31,10 @@ public class LaunchPadLoggingOptions
     /// <summary>
     ///     Base option from the serilog package
     /// </summary>
-    public bool WriteToProviders { get; set; } = false;
+    public bool WriteToProviders { get; set; }
 
     /// <summary>
     ///     Base option from the serilog package
     /// </summary>
     public bool PreserveStaticLogger { get; set; }
-}
+}