Extensions: fix failure to await DisposeAsync() before flushing logs

xo-energy · Nov 29, 2023 · 78dae16 · 78dae16
1 parent f24ef18
commit 78dae16
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/XO.Console.Cli.Extensions/CommandAppHostBuilderExtensions.cs b/XO.Console.Cli.Extensions/CommandAppHostBuilderExtensions.cs
@@ -95,15 +95,19 @@ await DisposeAndFlush(host, loggerFactory)
         return result;
     }
 
-    private static ValueTask DisposeAndFlush(IHost host, ILoggerFactory? loggerFactory)
+    private static async ValueTask DisposeAndFlush(IHost host, ILoggerFactory? loggerFactory)
     {
         try
         {
             if (host is IAsyncDisposable asyncDisposable)
-                return asyncDisposable.DisposeAsync();
-
-            host.Dispose();
-            return ValueTask.CompletedTask;
+            {
+                await asyncDisposable.DisposeAsync()
+                    .ConfigureAwait(false);
+            }
+            else
+            {
+                host.Dispose();
+            }
         }
         finally
         {