Remove throw OperationCanceledException in Host.StopAsync (#40426)

Marusyk · web-flow · commit 17b096dfbce8 · 2020-08-11T23:20:53.000-07:00
diff --git a/src/libraries/Microsoft.Extensions.Hosting/src/Internal/Host.cs b/src/libraries/Microsoft.Extensions.Hosting/src/Internal/Host.cs
@@ -76,7 +76,6 @@ public async Task StopAsync(CancellationToken cancellationToken = default)
                 {
                     foreach (IHostedService hostedService in _hostedServices.Reverse())
                     {
-                        token.ThrowIfCancellationRequested();
                         try
                         {
                             await hostedService.StopAsync(token).ConfigureAwait(false);
@@ -91,9 +90,14 @@ public async Task StopAsync(CancellationToken cancellationToken = default)
                 // Fire IHostApplicationLifetime.Stopped
                 _applicationLifetime.NotifyStopped();
 
-                token.ThrowIfCancellationRequested();
-                await _hostLifetime.StopAsync(token).ConfigureAwait(false);
-
+                try
+                {
+                    await _hostLifetime.StopAsync(token).ConfigureAwait(false);
+                }
+                catch (Exception ex)
+                {
+                    exceptions.Add(ex);
+                }
 
                 if (exceptions.Count > 0)
                 {

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,6 @@ public async Task StopAsync(CancellationToken cancellationToken = default)`
`76`	`76`	`{`
`77`	`77`	`foreach (IHostedService hostedService in _hostedServices.Reverse())`
`78`	`78`	`{`
`79`		`- token.ThrowIfCancellationRequested();`
`80`	`79`	`try`
`81`	`80`	`{`
`82`	`81`	`await hostedService.StopAsync(token).ConfigureAwait(false);`
`@@ -91,9 +90,14 @@ public async Task StopAsync(CancellationToken cancellationToken = default)`
`91`	`90`	`// Fire IHostApplicationLifetime.Stopped`
`92`	`91`	`_applicationLifetime.NotifyStopped();`
`93`	`92`
`94`		`- token.ThrowIfCancellationRequested();`
`95`		`- await _hostLifetime.StopAsync(token).ConfigureAwait(false);`
`96`		`-`
	`93`	`+ try`
	`94`	`+ {`
	`95`	`+ await _hostLifetime.StopAsync(token).ConfigureAwait(false);`
	`96`	`+ }`
	`97`	`+ catch (Exception ex)`
	`98`	`+ {`
	`99`	`+ exceptions.Add(ex);`
	`100`	`+ }`
`97`	`101`
`98`	`102`	`if (exceptions.Count > 0)`
`99`	`103`	`{`