PR feedback

Author: eerhardt

src/libraries/Microsoft.Extensions.Hosting/src/Internal/Host.cs

@@ -81,27 +81,29 @@ private async Task TryExecuteBackgroundServiceAsync(BackgroundService background
         {
             // backgroundService.ExecuteTask may not be set (e.g. if the derived class doesn't call base.StartAsync)
             Task backgroundTask = backgroundService.ExecuteTask;
-            if (backgroundTask != null)
+            if (backgroundTask == null)
             {
-                try
+                return;
+            }
+
+            try
+            {
+                await backgroundTask.ConfigureAwait(false);
+            }
+            catch (Exception ex)
+            {
+                // When the host is being stopped, it cancels the background services.
+                // This isn't an error condition, so don't log it as an error.
+                if (_stopCalled && backgroundTask.IsCanceled && ex is OperationCanceledException)
                 {
-                    await backgroundTask.ConfigureAwait(false);
+                    return;
                 }
-                catch (Exception ex)
-                {
-                    // When the host is being stopped, it cancels the background services.
-                    // This isn't an error condition, so don't log it as an error.
-                    if (_stopCalled && backgroundTask.IsCanceled && ex is OperationCanceledException)
-                    {
-                        return;
-                    }
 
-                    _logger.BackgroundServiceFaulted(ex);
-                    if (_options.BackgroundServiceExceptionBehavior == BackgroundServiceExceptionBehavior.StopHost)
-                    {
-                        _logger.BackgroundServiceStoppingHost(ex);
-                        _applicationLifetime.StopApplication();
-                    }
+                _logger.BackgroundServiceFaulted(ex);
+                if (_options.BackgroundServiceExceptionBehavior == BackgroundServiceExceptionBehavior.StopHost)
+                {
+                    _logger.BackgroundServiceStoppingHost(ex);
+                    _applicationLifetime.StopApplication();
                 }
             }
         }

src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/Internal/HostTests.cs

@@ -1418,7 +1418,7 @@ public async Task StartOnBackgroundServiceThatDoesNotCallBase()
 
             foreach (LogEvent logEvent in logger.GetEvents())
             {
-                Assert.True(logEvent.LogLevel <= LogLevel.Information, "All logged events should be les than or equal to Information. No Warnings or Errors.");
+                Assert.True(logEvent.LogLevel <= LogLevel.Information, "All logged events should be less than or equal to Information. No Warnings or Errors.");
 
                 Assert.NotEqual("BackgroundServiceFaulted", logEvent.EventId.Name);
             }