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

Added try/catch around scheduled checks so one failure doesn't block the rest. Applied some formatting to email HTML notification.

Browse Source
This commit is contained in:
AndyButland
2017-06-05 13:35:08 +02:00
parent 0f7165dada
commit bf194a819a
1 changed files with 40 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,7 +13,26 @@ namespace Umbraco.Web.HealthCheck
internal HealthCheckResults(IEnumerable<HealthCheck> checks)
{
_results = checks.ToDictionary(t => t.Name, t => t.GetStatus());
_results = checks.ToDictionary(
t => t.Name,
t => {
try
{
return t.GetStatus();
}
catch (Exception ex)
{
LogHelper.Error<HealthCheckResults>(string.Format("Error running scheduled health check: {0}", t.Name), ex);
var message = string.Format("Health check failed with exception: {0}. See logs for details.", ex.Message);
return new List<HealthCheckStatus>
{
new HealthCheckStatus(message)
{
ResultType = StatusResultType.Error
}
};
}
});
}
internal void LogResults()
@@ -66,17 +85,34 @@ namespace Umbraco.Web.HealthCheck
foreach (var checkResult in checkResults)
{
sb.AppendFormat("\t{0}Result: '{1}' , Message: '{2}'{3}", newItem, checkResult.ResultType, SimpleHtmlToMarkDown(checkResult.Message, slackMarkDown), Environment.NewLine);
sb.AppendFormat("\t{0}Result: '{1}', Message: '{2}'{3}", newItem, checkResult.ResultType, SimpleHtmlToMarkDown(checkResult.Message, slackMarkDown), Environment.NewLine);
}
}
return sb.ToString();
}
internal string ResultsAsHtml()
{
Markdown mark = new Markdown();
return mark.Transform(ResultsAsMarkDown());
var mark = new Markdown();
var html = mark.Transform(ResultsAsMarkDown());
html = ApplyHtmlHighlighting(html);
return html;
}
private string ApplyHtmlHighlighting(string html)
{
html = ApplyHtmlHighlightingForStatus(html, StatusResultType.Success, "5cb85c");
html = ApplyHtmlHighlightingForStatus(html, StatusResultType.Warning, "f0ad4e");
return ApplyHtmlHighlightingForStatus(html, StatusResultType.Error, "d9534f");
}
private string ApplyHtmlHighlightingForStatus(string html, StatusResultType status, string color)
{
return html
.Replace("Result: '" + status + "'", "Result <span style=\"color: #" + color + "\">" + status + "</span>");
}
private string SimpleHtmlToMarkDown(string html, bool slackMarkDown = false)
{
if (slackMarkDown)