Merge pull request #126 from mayuki/hotfix/AbortOnActivationError

Fix stalls when class activation fails.
mayuki · Mar 5, 2024 · 28257ec · 28257ec
2 parents 7eb829b + 11b6f5b
commit 28257ec
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 4 deletions.
diff --git a/src/Cocona.Lite/Lite/Hosting/CoconaLiteAppHost.cs b/src/Cocona.Lite/Lite/Hosting/CoconaLiteAppHost.cs
@@ -1,3 +1,5 @@
+using System;
+using Cocona.Application;
 using Cocona.Command;
 
 namespace Cocona.Lite.Hosting;
@@ -21,6 +23,7 @@ public async Task RunAsync(CancellationToken cancellationToken)
     {
         var linkedCancellationToken = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, _cancellationTokenSource.Token);
         var bootstrapper = _serviceProvider.GetRequiredService<ICoconaBootstrapper>();
+        var console = _serviceProvider.GetRequiredService<ICoconaConsoleProvider>();
 
 #pragma warning disable RS0030 // Do not used banned APIs
         Console.CancelKeyPress += OnCancelKeyPress;
@@ -54,6 +57,11 @@ public async Task RunAsync(CancellationToken cancellationToken)
             // NOTE: Ignore OperationCanceledException that was thrown by non-user code.
             Environment.ExitCode = 130;
         }
+        catch (Exception ex)
+        {
+            console.Error.WriteLine(ex.ToString());
+            Environment.ExitCode = 1;
+        }
 
         _waitForShutdown.Set();
 

diff --git a/src/Cocona/Hosting/CoconaHostedService.cs b/src/Cocona/Hosting/CoconaHostedService.cs
@@ -67,13 +67,15 @@ private async Task ExecuteCoconaApplicationAsync(Task waitForApplicationStarted)
             // NOTE: Ignore OperationCanceledException that was thrown by non-user code.
             Environment.ExitCode = 0;
         }
-        catch (Exception)
+        catch (Exception ex)
         {
+            _console.Error.WriteLine(ex.ToString());
             Environment.ExitCode = 1;
-            throw;
         }
-
-        _lifetime.StopApplication();
+        finally
+        {
+            _lifetime.StopApplication();
+        }
     }
 
     public async Task StopAsync(CancellationToken cancellationToken)

diff --git a/test/Cocona.Test/Integration/CoconaAppRunTest.cs b/test/Cocona.Test/Integration/CoconaAppRunTest.cs
@@ -989,4 +989,27 @@ class TestCommand_StopParsingOption
         public void A([Option]int a, [Option(StopParsingOptions = true)]string b, [Argument]string arg0, [Argument]string[] args)
             => Console.WriteLine($"A:{a}:{b}:{arg0}:{string.Join(",", args)}");
     }
+
+
+    [Theory]
+    [InlineData(RunBuilderMode.CreateHostBuilder)]
+    [InlineData(RunBuilderMode.CreateBuilder)]
+    public void CoconaApp_Run_AbortOnActivationError(RunBuilderMode mode)
+    {
+        var (stdOut, stdErr, exitCode) = Run<TestCommand_AbortOnActivationError>(mode, Array.Empty<string>());
+        exitCode.Should().Be(1);
+        stdErr.Should().StartWith("System.InvalidOperationException: Unable to resolve service");
+    }
+
+    class TestCommand_AbortOnActivationError
+    {
+        public TestCommand_AbortOnActivationError(Class1 class1)
+        { }
+
+        public void A()
+            => Console.WriteLine($"Hello");
+
+        public class Class1
+        { }
+    }
 }