Merge pull request #104 from damianh/exited-successfully-only

damianh · web-flow · commit 438d3d71f145 · 2020-09-25T13:32:49.000+02:00
Stop waiting on ExitedWithError
diff --git a/src/LittleForker/ProcessSupervisor.cs b/src/LittleForker/ProcessSupervisor.cs
@@ -312,12 +312,7 @@ private async Task OnStop(TimeSpan? timeout)
                     // only means the process has _started_ to shut down.
 
                     await CooperativeShutdown.SignalExit(ProcessInfo.Id, _loggerFactory).TimeoutAfter(timeout.Value);
-                    var exited = this.WhenStateIs(State.ExitedSuccessfully);
-                    var exitedWithError = this.WhenStateIs(State.ExitedWithError);
-
-                    await Task
-                        .WhenAny(exited, exitedWithError)
-                        .TimeoutAfter(timeout.Value);
+                    await this.WhenStateIs(State.ExitedSuccessfully).TimeoutAfter(timeout.Value);
                 }
                 catch (TimeoutException)
                 {

Original file line number	Diff line number	Diff line change
`@@ -312,12 +312,7 @@ private async Task OnStop(TimeSpan? timeout)`
`312`	`312`	`// only means the process has _started_ to shut down.`
`313`	`313`
`314`	`314`	`await CooperativeShutdown.SignalExit(ProcessInfo.Id, _loggerFactory).TimeoutAfter(timeout.Value);`
`315`		`- var exited = this.WhenStateIs(State.ExitedSuccessfully);`
`316`		`- var exitedWithError = this.WhenStateIs(State.ExitedWithError);`
`317`		`-`
`318`		`- await Task`
`319`		`- .WhenAny(exited, exitedWithError)`
`320`		`- .TimeoutAfter(timeout.Value);`
	`315`	`+ await this.WhenStateIs(State.ExitedSuccessfully).TimeoutAfter(timeout.Value);`
`321`	`316`	`}`
`322`	`317`	`catch (TimeoutException)`
`323`	`318`	`{`