The most significant changes include the removal of the System.Data namespace from several files, the modification of the return type of the ToListAsync and GetDataForTypeAsync methods, and the addition of a new condition in several catch blocks.

bluemodus-brandon · bluemodus-brandon · commit aef0f4601586 · 2024-03-31T16:09:29.000-04:00
1. The `System.Data` namespace was removed from several files as it was no longer needed. This change simplifies the code and reduces dependencies.

2. The return type of the `ToListAsync` method in `IObjectQueryExtensions.cs` was changed from `IEnumerable&lt;TObject&gt;` to `List&lt;TObject&gt;`. This change makes the return type more specific and allows for more operations on the returned data.

3. The return statement in `IObjectQueryExtensions.cs` was modified to return a new list with zero elements instead of an empty enumerable when the results are null. This change ensures that the method always returns a list, even when there are no results.

4. The `GetDataForTypeAsync` method in several files was updated to return a `List&lt;T&gt;` instead of `IEnumerable&lt;T&gt;`. This change, like the one for `ToListAsync`, makes the return type more specific.

5. The code that converts the result of `GetDataForTypeAsync` to a list was removed in several files, as the method now directly returns a list. This change simplifies the code and reduces unnecessary operations.

6. An additional condition was added to several `catch` blocks to check if the exception message contains "reader is closed". This change improves error handling by providing a more specific response to a common error.

7. The `OnSite` method was added to the query in `EventLogHealthCheck.cs` to filter the results based on the current site ID. This change improves the relevance of the returned data.

8. The `GetDataForTypeAsync` method in `SitePresentationHealthCheck.cs` was updated to throw a `NotImplementedException`, as it is not used in this class. This change prevents potential misuse of the method.
diff --git a/src/XperienceCommunity.AspNetCore.HealthChecks/Extensions/IObjectQueryExtensions.cs b/src/XperienceCommunity.AspNetCore.HealthChecks/Extensions/IObjectQueryExtensions.cs
@@ -1,5 +1,4 @@
-﻿using System.Data;
-using CMS.DataEngine;
+﻿using CMS.DataEngine;
 
 namespace XperienceCommunity.AspNetCore.HealthChecks.Extensions
 {
@@ -14,7 +13,7 @@ public static class IObjectQueryExtensions
         /// <param name="cancellationToken"></param>
         /// <returns></returns>
         /// <exception cref="ArgumentNullException"></exception>
-        public static async Task<IEnumerable<TObject>> ToListAsync<TQuery, TObject>(this IObjectQuery<TQuery, TObject> query, CancellationToken cancellationToken = default)
+        public static async Task<List<TObject>> ToListAsync<TQuery, TObject>(this IObjectQuery<TQuery, TObject> query, CancellationToken cancellationToken = default)
         where TQuery : IObjectQuery<TQuery, TObject>
         where TObject : BaseInfo
         {
@@ -28,8 +27,8 @@ public static async Task<IEnumerable<TObject>> ToListAsync<TQuery, TObject>(this
                 //.GetEnumerableTypedResultAsync(commandBehavior: CommandBehavior.CloseConnection, true, cancellationToken: cancellationToken)
                 .ConfigureAwait(false);
 
-            
-            return results.ToList() ?? Enumerable.Empty<TObject>();
+
+            return results?.ToList() ?? new List<TObject>(0);
         }
     }
 }
diff --git a/src/XperienceCommunity.AspNetCore.HealthChecks/HealthChecks/AzureSearchTaskHealthCheck.cs b/src/XperienceCommunity.AspNetCore.HealthChecks/HealthChecks/AzureSearchTaskHealthCheck.cs
@@ -28,7 +28,7 @@ public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context
         {
             try
             {
-                var searchTasks = (await GetDataForTypeAsync(cancellationToken)).ToList();
+                var searchTasks = await GetDataForTypeAsync(cancellationToken);
 
                 if (searchTasks.Count == 0)
                 {
@@ -47,7 +47,9 @@ public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context
             }
             catch (InvalidOperationException ex)
             {
-                if (ex.Message.Contains("open DataReader", StringComparison.OrdinalIgnoreCase) || ex.Message.Contains("current state", StringComparison.OrdinalIgnoreCase))
+                if (ex.Message.Contains("open DataReader", StringComparison.OrdinalIgnoreCase) 
+                    || ex.Message.Contains("current state", StringComparison.OrdinalIgnoreCase)
+                    || ex.Message.Contains("reader is closed", StringComparison.OrdinalIgnoreCase))
                 {
                     return HealthCheckResult.Healthy();
                 }
@@ -68,7 +70,7 @@ protected override IEnumerable<SearchTaskAzureInfo> GetDataForType()
             return result.ToList();
         }
 
-        protected override async Task<IEnumerable<SearchTaskAzureInfo>> GetDataForTypeAsync(
+        protected override async Task<List<SearchTaskAzureInfo>> GetDataForTypeAsync(
             CancellationToken cancellationToken = default)
         {
             var query = _searchTaskAzureInfoProvider.Get()
diff --git a/src/XperienceCommunity.AspNetCore.HealthChecks/HealthChecks/BaseKenticoHealthCheck.cs b/src/XperienceCommunity.AspNetCore.HealthChecks/HealthChecks/BaseKenticoHealthCheck.cs
@@ -19,7 +19,7 @@ public abstract class BaseKenticoHealthCheck<T> where T : BaseInfo
         /// </summary>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>A task that represents the asynchronous operation and contains an enumerable collection of Kentico objects.</returns>
-        protected abstract Task<IEnumerable<T>> GetDataForTypeAsync(CancellationToken cancellationToken = default);
+        protected abstract Task<List<T>> GetDataForTypeAsync(CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Gets the error data for the specified Kentico objects.
diff --git a/src/XperienceCommunity.AspNetCore.HealthChecks/HealthChecks/EventLogHealthCheck.cs b/src/XperienceCommunity.AspNetCore.HealthChecks/HealthChecks/EventLogHealthCheck.cs
@@ -1,8 +1,6 @@
 ﻿using System.Collections.ObjectModel;
-using System.Data;
 using CMS.EventLog;
 using CMS.Helpers;
-using CMS.Search.Azure;
 using CMS.SiteProvider;
 using Microsoft.Extensions.Diagnostics.HealthChecks;
 using XperienceCommunity.AspNetCore.HealthChecks.Extensions;
@@ -29,7 +27,7 @@ public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context
         {
             try
             {
-                var eventList = (await GetDataForTypeAsync(cancellationToken)).ToList();
+                var eventList = await GetDataForTypeAsync(cancellationToken);
 
                 var exceptionEvents = eventList
                     .Where(e => e.EventType == "E"
@@ -47,7 +45,9 @@ public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context
             }
             catch (InvalidOperationException ex)
             {
-                if (ex.Message.Contains("open DataReader", StringComparison.OrdinalIgnoreCase) || ex.Message.Contains("current state", StringComparison.OrdinalIgnoreCase))
+                if (ex.Message.Contains("open DataReader", StringComparison.OrdinalIgnoreCase)
+                    || ex.Message.Contains("current state", StringComparison.OrdinalIgnoreCase)
+                    || ex.Message.Contains("reader is closed", StringComparison.OrdinalIgnoreCase))
                 {
                     return HealthCheckResult.Healthy();
                 }
@@ -64,16 +64,18 @@ protected override IEnumerable<EventLogInfo> GetDataForType()
         {
             var query = _eventLogInfoProvider.Get()
                 .WhereEquals(nameof(EventLogInfo.EventType), "E")
-                .WhereNotEquals(nameof(EventLogInfo.Source), nameof(HealthReport));
+                .WhereNotEquals(nameof(EventLogInfo.Source), nameof(HealthReport))
+                .OnSite(SiteContext.CurrentSiteID);
 
             return query.ToList();
         }
 
-        protected override async Task<IEnumerable<EventLogInfo>> GetDataForTypeAsync(CancellationToken cancellationToken = default)
+        protected override async Task<List<EventLogInfo>> GetDataForTypeAsync(CancellationToken cancellationToken = default)
         {
             var query = _eventLogInfoProvider.Get()
                 .WhereEquals(nameof(EventLogInfo.EventType), "E")
-                .WhereNotEquals(nameof(EventLogInfo.Source), nameof(HealthReport));
+                .WhereNotEquals(nameof(EventLogInfo.Source), nameof(HealthReport))
+                .OnSite(SiteContext.CurrentSiteID);
 
             return await query.ToListAsync(cancellationToken: cancellationToken);
         }
diff --git a/src/XperienceCommunity.AspNetCore.HealthChecks/HealthChecks/LocalSearchTaskHealthCheck.cs b/src/XperienceCommunity.AspNetCore.HealthChecks/HealthChecks/LocalSearchTaskHealthCheck.cs
@@ -26,7 +26,7 @@ public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context
         {
             try
             {
-                var searchTasks = (await GetDataForTypeAsync(cancellationToken)).ToList();
+                var searchTasks = await GetDataForTypeAsync(cancellationToken);
 
                 if (searchTasks.Count == 0)
                 {
@@ -37,7 +37,9 @@ public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context
             }
             catch (InvalidOperationException ex)
             {
-                if (ex.Message.Contains("open DataReader", StringComparison.OrdinalIgnoreCase) || ex.Message.Contains("current state", StringComparison.OrdinalIgnoreCase))
+                if (ex.Message.Contains("open DataReader", StringComparison.OrdinalIgnoreCase)
+                    || ex.Message.Contains("current state", StringComparison.OrdinalIgnoreCase)
+                    || ex.Message.Contains("reader is closed", StringComparison.OrdinalIgnoreCase))
                 {
                     return HealthCheckResult.Healthy();
                 }
@@ -58,7 +60,7 @@ protected override IEnumerable<SearchTaskInfo> GetDataForType()
             return query.ToList();
         }
 
-        protected override async Task<IEnumerable<SearchTaskInfo>> GetDataForTypeAsync(CancellationToken cancellationToken = default)
+        protected override async Task<List<SearchTaskInfo>> GetDataForTypeAsync(CancellationToken cancellationToken = default)
         {
             
             var query = _searchTaskInfoProvider.Get()
diff --git a/src/XperienceCommunity.AspNetCore.HealthChecks/HealthChecks/SiteConfigurationHealthCheck.cs b/src/XperienceCommunity.AspNetCore.HealthChecks/HealthChecks/SiteConfigurationHealthCheck.cs
@@ -24,15 +24,17 @@ public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context
         {
             try
             {
-                var sites = (await GetDataForTypeAsync(cancellationToken)).ToList();
+                var sites = await GetDataForTypeAsync(cancellationToken);
 
                 return sites.Count == 0 ?
                     HealthCheckResult.Unhealthy("There are no sites configured.")
                     : HealthCheckResult.Healthy("Sites have been added to the CMS.");
             }
             catch (InvalidOperationException ex)
             {
-                if (ex.Message.Contains("open DataReader", StringComparison.OrdinalIgnoreCase) || ex.Message.Contains("current state", StringComparison.OrdinalIgnoreCase))
+                if (ex.Message.Contains("open DataReader", StringComparison.OrdinalIgnoreCase)
+                    || ex.Message.Contains("current state", StringComparison.OrdinalIgnoreCase)
+                    || ex.Message.Contains("reader is closed", StringComparison.OrdinalIgnoreCase))
                 {
                     return HealthCheckResult.Healthy();
                 }
@@ -52,7 +54,7 @@ protected override IEnumerable<SiteInfo> GetDataForType()
             return query.ToList();
         }
 
-        protected override async Task<IEnumerable<SiteInfo>> GetDataForTypeAsync(CancellationToken cancellationToken = default)
+        protected override async Task<List<SiteInfo>> GetDataForTypeAsync(CancellationToken cancellationToken = default)
         {
             var query = _siteInfoProvider.Get();
             return await query.ToListAsync(cancellationToken: cancellationToken);
diff --git a/src/XperienceCommunity.AspNetCore.HealthChecks/HealthChecks/SitePresentationHealthCheck.cs b/src/XperienceCommunity.AspNetCore.HealthChecks/HealthChecks/SitePresentationHealthCheck.cs
@@ -71,8 +71,9 @@ public SitePresentationHealthCheck(ISiteService siteService,
             }
             catch (InvalidOperationException ex)
             {
-
-                if (ex.Message.Contains("open DataReader", StringComparison.OrdinalIgnoreCase))
+                if (ex.Message.Contains("open DataReader", StringComparison.OrdinalIgnoreCase)
+                    || ex.Message.Contains("current state", StringComparison.OrdinalIgnoreCase)
+                    || ex.Message.Contains("reader is closed", StringComparison.OrdinalIgnoreCase))
                 {
                     return HealthCheckResult.Healthy();
                 }
@@ -92,7 +93,7 @@ protected override IEnumerable<SiteInfo> GetDataForType()
             return new List<SiteInfo>() { query };
         }
 
-        protected override Task<IEnumerable<SiteInfo>> GetDataForTypeAsync(CancellationToken cancellationToken = default)
+        protected override Task<List<SiteInfo>> GetDataForTypeAsync(CancellationToken cancellationToken = default)
         {
             throw new NotImplementedException();
         }
diff --git a/src/XperienceCommunity.AspNetCore.HealthChecks/HealthChecks/StagingTaskHealthCheck.cs b/src/XperienceCommunity.AspNetCore.HealthChecks/HealthChecks/StagingTaskHealthCheck.cs
@@ -90,7 +90,9 @@ public StagingTaskHealthCheck(IStagingTaskInfoProvider stagingTaskInfoProvider,
             }
             catch (InvalidOperationException ex)
             {
-                if (ex.Message.Contains("open DataReader", StringComparison.OrdinalIgnoreCase) || ex.Message.Contains("current state", StringComparison.OrdinalIgnoreCase))
+                if (ex.Message.Contains("open DataReader", StringComparison.OrdinalIgnoreCase)
+                    || ex.Message.Contains("current state", StringComparison.OrdinalIgnoreCase)
+                    || ex.Message.Contains("reader is closed", StringComparison.OrdinalIgnoreCase))
                 {
                     return HealthCheckResult.Healthy();
                 }
diff --git a/src/XperienceCommunity.AspNetCore.HealthChecks/HealthChecks/WebFarmTaskHealthCheck.cs b/src/XperienceCommunity.AspNetCore.HealthChecks/HealthChecks/WebFarmTaskHealthCheck.cs
@@ -27,7 +27,7 @@ public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context
 
             try
             {
-                var data = (await GetDataForTypeAsync(cancellationToken)).ToList();
+                var data = await GetDataForTypeAsync(cancellationToken);
 
                 if (data.Count != 0)
                 {
@@ -38,7 +38,9 @@ public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context
             }
             catch (InvalidOperationException ex)
             {
-                if (ex.Message.Contains("open DataReader", StringComparison.OrdinalIgnoreCase) || ex.Message.Contains("current state", StringComparison.OrdinalIgnoreCase))
+                if (ex.Message.Contains("open DataReader", StringComparison.OrdinalIgnoreCase)
+                    || ex.Message.Contains("current state", StringComparison.OrdinalIgnoreCase)
+                    || ex.Message.Contains("reader is closed", StringComparison.OrdinalIgnoreCase))
                 {
                     return HealthCheckResult.Healthy();
                 }
@@ -60,7 +62,7 @@ protected override IEnumerable<WebFarmServerTaskInfo> GetDataForType()
             return query.ToList();
         }
 
-        protected override async Task<IEnumerable<WebFarmServerTaskInfo>> GetDataForTypeAsync(CancellationToken cancellationToken = default)
+        protected override async Task<List<WebFarmServerTaskInfo>> GetDataForTypeAsync(CancellationToken cancellationToken = default)
         {
             var query = _webFarmTaskInfoProvider
                 .Get()

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`		`-using System.Data;`
`2`		`-using CMS.DataEngine;`
	`1`	`+using CMS.DataEngine;`
`3`	`2`
`4`	`3`	`namespace XperienceCommunity.AspNetCore.HealthChecks.Extensions`
`5`	`4`	`{`
`@@ -14,7 +13,7 @@ public static class IObjectQueryExtensions`
`14`	`13`	`/// <param name="cancellationToken"></param>`
`15`	`14`	`/// <returns></returns>`
`16`	`15`	`/// <exception cref="ArgumentNullException"></exception>`
`17`		`- public static async Task<IEnumerable<TObject>> ToListAsync<TQuery, TObject>(this IObjectQuery<TQuery, TObject> query, CancellationToken cancellationToken = default)`
	`16`	`+ public static async Task<List<TObject>> ToListAsync<TQuery, TObject>(this IObjectQuery<TQuery, TObject> query, CancellationToken cancellationToken = default)`
`18`	`17`	`where TQuery : IObjectQuery<TQuery, TObject>`
`19`	`18`	`where TObject : BaseInfo`
`20`	`19`	`{`
`@@ -28,8 +27,8 @@ public static async Task<IEnumerable<TObject>> ToListAsync<TQuery, TObject>(this`
`28`	`27`	`//.GetEnumerableTypedResultAsync(commandBehavior: CommandBehavior.CloseConnection, true, cancellationToken: cancellationToken)`
`29`	`28`	`.ConfigureAwait(false);`
`30`	`29`
`31`		`-`
`32`		`- return results.ToList() ?? Enumerable.Empty<TObject>();`
	`30`	`+`
	`31`	`+ return results?.ToList() ?? new List<TObject>(0);`
`33`	`32`	`}`
`34`	`33`	`}`
`35`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context`
`28`	`28`	`{`
`29`	`29`	`try`
`30`	`30`	`{`
`31`		`- var searchTasks = (await GetDataForTypeAsync(cancellationToken)).ToList();`
	`31`	`+ var searchTasks = await GetDataForTypeAsync(cancellationToken);`
`32`	`32`
`33`	`33`	`if (searchTasks.Count == 0)`
`34`	`34`	`{`
`@@ -47,7 +47,9 @@ public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context`
`47`	`47`	`}`
`48`	`48`	`catch (InvalidOperationException ex)`
`49`	`49`	`{`
`50`		`- if (ex.Message.Contains("open DataReader", StringComparison.OrdinalIgnoreCase) \|\| ex.Message.Contains("current state", StringComparison.OrdinalIgnoreCase))`
	`50`	`+ if (ex.Message.Contains("open DataReader", StringComparison.OrdinalIgnoreCase)`
	`51`	`+ \|\| ex.Message.Contains("current state", StringComparison.OrdinalIgnoreCase)`
	`52`	`+ \|\| ex.Message.Contains("reader is closed", StringComparison.OrdinalIgnoreCase))`
`51`	`53`	`{`
`52`	`54`	`return HealthCheckResult.Healthy();`
`53`	`55`	`}`
`@@ -68,7 +70,7 @@ protected override IEnumerable<SearchTaskAzureInfo> GetDataForType()`
`68`	`70`	`return result.ToList();`
`69`	`71`	`}`
`70`	`72`
`71`		`- protected override async Task<IEnumerable<SearchTaskAzureInfo>> GetDataForTypeAsync(`
	`73`	`+ protected override async Task<List<SearchTaskAzureInfo>> GetDataForTypeAsync(`
`72`	`74`	`CancellationToken cancellationToken = default)`
`73`	`75`	`{`
`74`	`76`	`var query = _searchTaskAzureInfoProvider.Get()`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,6 @@`
`1`	`1`	`using System.Collections.ObjectModel;`
`2`		`-using System.Data;`
`3`	`2`	`using CMS.EventLog;`
`4`	`3`	`using CMS.Helpers;`
`5`		`-using CMS.Search.Azure;`
`6`	`4`	`using CMS.SiteProvider;`
`7`	`5`	`using Microsoft.Extensions.Diagnostics.HealthChecks;`
`8`	`6`	`using XperienceCommunity.AspNetCore.HealthChecks.Extensions;`
`@@ -29,7 +27,7 @@ public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context`
`29`	`27`	`{`
`30`	`28`	`try`
`31`	`29`	`{`
`32`		`- var eventList = (await GetDataForTypeAsync(cancellationToken)).ToList();`
	`30`	`+ var eventList = await GetDataForTypeAsync(cancellationToken);`
`33`	`31`
`34`	`32`	`var exceptionEvents = eventList`
`35`	`33`	`.Where(e => e.EventType == "E"`
`@@ -47,7 +45,9 @@ public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context`
`47`	`45`	`}`
`48`	`46`	`catch (InvalidOperationException ex)`
`49`	`47`	`{`
`50`		`- if (ex.Message.Contains("open DataReader", StringComparison.OrdinalIgnoreCase) \|\| ex.Message.Contains("current state", StringComparison.OrdinalIgnoreCase))`
	`48`	`+ if (ex.Message.Contains("open DataReader", StringComparison.OrdinalIgnoreCase)`
	`49`	`+ \|\| ex.Message.Contains("current state", StringComparison.OrdinalIgnoreCase)`
	`50`	`+ \|\| ex.Message.Contains("reader is closed", StringComparison.OrdinalIgnoreCase))`
`51`	`51`	`{`
`52`	`52`	`return HealthCheckResult.Healthy();`
`53`	`53`	`}`
`@@ -64,16 +64,18 @@ protected override IEnumerable<EventLogInfo> GetDataForType()`
`64`	`64`	`{`
`65`	`65`	`var query = _eventLogInfoProvider.Get()`
`66`	`66`	`.WhereEquals(nameof(EventLogInfo.EventType), "E")`
`67`		`- .WhereNotEquals(nameof(EventLogInfo.Source), nameof(HealthReport));`
	`67`	`+ .WhereNotEquals(nameof(EventLogInfo.Source), nameof(HealthReport))`
	`68`	`+ .OnSite(SiteContext.CurrentSiteID);`
`68`	`69`
`69`	`70`	`return query.ToList();`
`70`	`71`	`}`
`71`	`72`
`72`		`- protected override async Task<IEnumerable<EventLogInfo>> GetDataForTypeAsync(CancellationToken cancellationToken = default)`
	`73`	`+ protected override async Task<List<EventLogInfo>> GetDataForTypeAsync(CancellationToken cancellationToken = default)`
`73`	`74`	`{`
`74`	`75`	`var query = _eventLogInfoProvider.Get()`
`75`	`76`	`.WhereEquals(nameof(EventLogInfo.EventType), "E")`
`76`		`- .WhereNotEquals(nameof(EventLogInfo.Source), nameof(HealthReport));`
	`77`	`+ .WhereNotEquals(nameof(EventLogInfo.Source), nameof(HealthReport))`
	`78`	`+ .OnSite(SiteContext.CurrentSiteID);`
`77`	`79`
`78`	`80`	`return await query.ToListAsync(cancellationToken: cancellationToken);`
`79`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context`
`26`	`26`	`{`
`27`	`27`	`try`
`28`	`28`	`{`
`29`		`- var searchTasks = (await GetDataForTypeAsync(cancellationToken)).ToList();`
	`29`	`+ var searchTasks = await GetDataForTypeAsync(cancellationToken);`
`30`	`30`
`31`	`31`	`if (searchTasks.Count == 0)`
`32`	`32`	`{`
`@@ -37,7 +37,9 @@ public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context`
`37`	`37`	`}`
`38`	`38`	`catch (InvalidOperationException ex)`
`39`	`39`	`{`
`40`		`- if (ex.Message.Contains("open DataReader", StringComparison.OrdinalIgnoreCase) \|\| ex.Message.Contains("current state", StringComparison.OrdinalIgnoreCase))`
	`40`	`+ if (ex.Message.Contains("open DataReader", StringComparison.OrdinalIgnoreCase)`
	`41`	`+ \|\| ex.Message.Contains("current state", StringComparison.OrdinalIgnoreCase)`
	`42`	`+ \|\| ex.Message.Contains("reader is closed", StringComparison.OrdinalIgnoreCase))`
`41`	`43`	`{`
`42`	`44`	`return HealthCheckResult.Healthy();`
`43`	`45`	`}`
`@@ -58,7 +60,7 @@ protected override IEnumerable<SearchTaskInfo> GetDataForType()`
`58`	`60`	`return query.ToList();`
`59`	`61`	`}`
`60`	`62`
`61`		`- protected override async Task<IEnumerable<SearchTaskInfo>> GetDataForTypeAsync(CancellationToken cancellationToken = default)`
	`63`	`+ protected override async Task<List<SearchTaskInfo>> GetDataForTypeAsync(CancellationToken cancellationToken = default)`
`62`	`64`	`{`
`63`	`65`
`64`	`66`	`var query = _searchTaskInfoProvider.Get()`
Original file line number	Diff line number	Diff line change
`@@ -24,15 +24,17 @@ public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context`
`24`	`24`	`{`
`25`	`25`	`try`
`26`	`26`	`{`
`27`		`- var sites = (await GetDataForTypeAsync(cancellationToken)).ToList();`
	`27`	`+ var sites = await GetDataForTypeAsync(cancellationToken);`
`28`	`28`
`29`	`29`	`return sites.Count == 0 ?`
`30`	`30`	`HealthCheckResult.Unhealthy("There are no sites configured.")`
`31`	`31`	`: HealthCheckResult.Healthy("Sites have been added to the CMS.");`
`32`	`32`	`}`
`33`	`33`	`catch (InvalidOperationException ex)`
`34`	`34`	`{`
`35`		`- if (ex.Message.Contains("open DataReader", StringComparison.OrdinalIgnoreCase) \|\| ex.Message.Contains("current state", StringComparison.OrdinalIgnoreCase))`
	`35`	`+ if (ex.Message.Contains("open DataReader", StringComparison.OrdinalIgnoreCase)`
	`36`	`+ \|\| ex.Message.Contains("current state", StringComparison.OrdinalIgnoreCase)`
	`37`	`+ \|\| ex.Message.Contains("reader is closed", StringComparison.OrdinalIgnoreCase))`
`36`	`38`	`{`
`37`	`39`	`return HealthCheckResult.Healthy();`
`38`	`40`	`}`
`@@ -52,7 +54,7 @@ protected override IEnumerable<SiteInfo> GetDataForType()`
`52`	`54`	`return query.ToList();`
`53`	`55`	`}`
`54`	`56`
`55`		`- protected override async Task<IEnumerable<SiteInfo>> GetDataForTypeAsync(CancellationToken cancellationToken = default)`
	`57`	`+ protected override async Task<List<SiteInfo>> GetDataForTypeAsync(CancellationToken cancellationToken = default)`
`56`	`58`	`{`
`57`	`59`	`var query = _siteInfoProvider.Get();`
`58`	`60`	`return await query.ToListAsync(cancellationToken: cancellationToken);`
Original file line number	Diff line number	Diff line change
`@@ -71,8 +71,9 @@ public SitePresentationHealthCheck(ISiteService siteService,`
`71`	`71`	`}`
`72`	`72`	`catch (InvalidOperationException ex)`
`73`	`73`	`{`
`74`		`-`
`75`		`- if (ex.Message.Contains("open DataReader", StringComparison.OrdinalIgnoreCase))`
	`74`	`+ if (ex.Message.Contains("open DataReader", StringComparison.OrdinalIgnoreCase)`
	`75`	`+ \|\| ex.Message.Contains("current state", StringComparison.OrdinalIgnoreCase)`
	`76`	`+ \|\| ex.Message.Contains("reader is closed", StringComparison.OrdinalIgnoreCase))`
`76`	`77`	`{`
`77`	`78`	`return HealthCheckResult.Healthy();`
`78`	`79`	`}`
`@@ -92,7 +93,7 @@ protected override IEnumerable<SiteInfo> GetDataForType()`
`92`	`93`	`return new List<SiteInfo>() { query };`
`93`	`94`	`}`
`94`	`95`
`95`		`- protected override Task<IEnumerable<SiteInfo>> GetDataForTypeAsync(CancellationToken cancellationToken = default)`
	`96`	`+ protected override Task<List<SiteInfo>> GetDataForTypeAsync(CancellationToken cancellationToken = default)`
`96`	`97`	`{`
`97`	`98`	`throw new NotImplementedException();`
`98`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,9 @@ public StagingTaskHealthCheck(IStagingTaskInfoProvider stagingTaskInfoProvider,`
`90`	`90`	`}`
`91`	`91`	`catch (InvalidOperationException ex)`
`92`	`92`	`{`
`93`		`- if (ex.Message.Contains("open DataReader", StringComparison.OrdinalIgnoreCase) \|\| ex.Message.Contains("current state", StringComparison.OrdinalIgnoreCase))`
	`93`	`+ if (ex.Message.Contains("open DataReader", StringComparison.OrdinalIgnoreCase)`
	`94`	`+ \|\| ex.Message.Contains("current state", StringComparison.OrdinalIgnoreCase)`
	`95`	`+ \|\| ex.Message.Contains("reader is closed", StringComparison.OrdinalIgnoreCase))`
`94`	`96`	`{`
`95`	`97`	`return HealthCheckResult.Healthy();`
`96`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context`
`27`	`27`
`28`	`28`	`try`
`29`	`29`	`{`
`30`		`- var data = (await GetDataForTypeAsync(cancellationToken)).ToList();`
	`30`	`+ var data = await GetDataForTypeAsync(cancellationToken);`
`31`	`31`
`32`	`32`	`if (data.Count != 0)`
`33`	`33`	`{`
`@@ -38,7 +38,9 @@ public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context`
`38`	`38`	`}`
`39`	`39`	`catch (InvalidOperationException ex)`
`40`	`40`	`{`
`41`		`- if (ex.Message.Contains("open DataReader", StringComparison.OrdinalIgnoreCase) \|\| ex.Message.Contains("current state", StringComparison.OrdinalIgnoreCase))`
	`41`	`+ if (ex.Message.Contains("open DataReader", StringComparison.OrdinalIgnoreCase)`
	`42`	`+ \|\| ex.Message.Contains("current state", StringComparison.OrdinalIgnoreCase)`
	`43`	`+ \|\| ex.Message.Contains("reader is closed", StringComparison.OrdinalIgnoreCase))`
`42`	`44`	`{`
`43`	`45`	`return HealthCheckResult.Healthy();`
`44`	`46`	`}`
`@@ -60,7 +62,7 @@ protected override IEnumerable<WebFarmServerTaskInfo> GetDataForType()`
`60`	`62`	`return query.ToList();`
`61`	`63`	`}`
`62`	`64`
`63`		`- protected override async Task<IEnumerable<WebFarmServerTaskInfo>> GetDataForTypeAsync(CancellationToken cancellationToken = default)`
	`65`	`+ protected override async Task<List<WebFarmServerTaskInfo>> GetDataForTypeAsync(CancellationToken cancellationToken = default)`
`64`	`66`	`{`
`65`	`67`	`var query = _webFarmTaskInfoProvider`
`66`	`68`	`.Get()`