yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename Results to GetResultsForStatus and only calculate the result set required

Browse Source
This commit is contained in:
Jeavon
2017-06-19 13:03:29 +01:00
parent 824eee80b3
commit b0827b75b2
2 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Umbraco.Web/HealthCheck/HealthCheckResults.cs
View File

@@ -158,29 +158,25 @@ namespace Umbraco.Web.HealthCheck
.Replace("</em>", "*");
}
public Dictionary<string, IEnumerable<HealthCheckStatus>> Results(StatusResultType resultType)
public Dictionary<string, IEnumerable<HealthCheckStatus>> GetResultsForStatus(StatusResultType resultType)
{
// a check is considered a success status if all checks are successful or info
var successResults = _results.Where(x => x.Value.Any(y => y.ResultType == StatusResultType.Success) && x.Value.All(y => y.ResultType == StatusResultType.Success || y.ResultType == StatusResultType.Info));
// a check is considered warn status if one check is warn and all others are success or info
var warnResults = _results.Where(x => x.Value.Any(y => y.ResultType == StatusResultType.Warning) && x.Value.All(y => y.ResultType == StatusResultType.Warning || y.ResultType == StatusResultType.Success || y.ResultType == StatusResultType.Info));
// a check is considered error status if any check is error
var errorResults = _results.Where(x => x.Value.Any(y => y.ResultType == StatusResultType.Error));
// a check is considered info status if all checks are info
var infoResults = _results.Where(x => x.Value.All(y => y.ResultType == StatusResultType.Info));
switch (resultType)
{
case StatusResultType.Success:
// a check is considered a success status if all checks are successful or info
var successResults = _results.Where(x => x.Value.Any(y => y.ResultType == StatusResultType.Success) && x.Value.All(y => y.ResultType == StatusResultType.Success || y.ResultType == StatusResultType.Info));
return successResults.ToDictionary(x => x.Key, x => x.Value);
case StatusResultType.Warning:
// a check is considered warn status if one check is warn and all others are success or info
var warnResults = _results.Where(x => x.Value.Any(y => y.ResultType == StatusResultType.Warning) && x.Value.All(y => y.ResultType == StatusResultType.Warning || y.ResultType == StatusResultType.Success || y.ResultType == StatusResultType.Info));
return warnResults.ToDictionary(x => x.Key, x => x.Value);
case StatusResultType.Error:
// a check is considered error status if any check is error
var errorResults = _results.Where(x => x.Value.Any(y => y.ResultType == StatusResultType.Error));
return errorResults.ToDictionary(x => x.Key, x => x.Value);
case StatusResultType.Info:
// a check is considered info status if all checks are info
var infoResults = _results.Where(x => x.Value.All(y => y.ResultType == StatusResultType.Info));
return infoResults.ToDictionary(x => x.Key, x => x.Value);
}

8
src/Umbraco.Web/HealthCheck/NotificationMethods/SlackNotificationMethod.cs
View File

@@ -42,10 +42,10 @@ namespace Umbraco.Web.HealthCheck.NotificationMethods
icon = Emoji.WhiteCheckMark;
}
var successResults = results.Results(StatusResultType.Success);
var warnResults = results.Results(StatusResultType.Warning);
var errorResults = results.Results(StatusResultType.Error);
var infoResults = results.Results(StatusResultType.Info);
var successResults = results.GetResultsForStatus(StatusResultType.Success);
var warnResults = results.GetResultsForStatus(StatusResultType.Warning);
var errorResults = results.GetResultsForStatus(StatusResultType.Error);
var infoResults = results.GetResultsForStatus(StatusResultType.Info);
// todo construct Slack Message using Slack Attachments