Fall back to IDisposable in Log.CloseAndFlushAsync() when the target …

…logger is not IAsyncDisposable
serilog · Sep 27, 2024 · b5085aa · b5085aa
1 parent 68881e1
commit b5085aa
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 4 deletions.
diff --git a/src/Serilog/Log.cs b/src/Serilog/Log.cs
@@ -59,11 +59,18 @@ public static void CloseAndFlush()
     /// <summary>
     /// Resets <see cref="Logger"/> to the default and disposes the original if possible
     /// </summary>
-    public static ValueTask CloseAndFlushAsync()
+    public static async ValueTask CloseAndFlushAsync()
     {
         var logger = Interlocked.Exchange(ref _logger, Serilog.Core.Logger.None);
 
-        return (logger as IAsyncDisposable)?.DisposeAsync() ?? default;
+        if (logger is IAsyncDisposable asyncDisposable)
+        {
+            await asyncDisposable.DisposeAsync();
+        }
+        else
+        {
+            (logger as IDisposable)?.Dispose();
+        }
     }
 #endif
 

diff --git a/test/Serilog.Tests/LogTests.cs b/test/Serilog.Tests/LogTests.cs
@@ -39,6 +39,15 @@ public async Task CloseAndFlushAsyncDisposesTheLogger()
         Assert.True(disposableLogger.IsDisposedAsync);
     }
 
+    [Fact]
+    public async Task CloseAndFlushAsyncDisposesTheLoggerEvenWhenItIsNotAsyncDisposable()
+    {
+        var disposableLogger = new SyncDisposableLogger();
+        Log.Logger = disposableLogger;
+        await Log.CloseAndFlushAsync();
+        Assert.True(disposableLogger.IsDisposed);
+    }
+
     [Fact]
     public async Task CloseAndFlushAsyncResetsLoggerToSilentLogger()
     {

diff --git a/test/Serilog.Tests/Support/DisposableLogger.cs b/test/Serilog.Tests/Support/DisposableLogger.cs
@@ -1,5 +1,3 @@
-#nullable enable
-
 namespace Serilog.Tests.Support;
 
 public class DisposableLogger : ILogger, IDisposable

diff --git a/test/Serilog.Tests/Support/SyncDisposableLogger.cs b/test/Serilog.Tests/Support/SyncDisposableLogger.cs
@@ -0,0 +1,19 @@
+#if FEATURE_ASYNCDISPOSABLE && FEATURE_DEFAULT_INTERFACE
+
+namespace Serilog.Tests.Support;
+
+public class SyncDisposableLogger: ILogger, IDisposable
+{
+    public bool IsDisposed { get; private set; }
+
+    public void Write(LogEvent logEvent)
+    {
+    }
+
+    public void Dispose()
+    {
+        IsDisposed = true;
+    }
+}
+
+#endif