Revert "Temp8 tinymce"
This commit is contained in:
Warren Buckley
@@ -1,8 +1,10 @@
|
||||
using System;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using Umbraco.Core.Composing;
|
||||
using Umbraco.Core;
|
||||
using Umbraco.Core.Models.Rdbms;
|
||||
using Umbraco.Core.Persistence;
|
||||
using Umbraco.Core.Persistence.SqlSyntax;
|
||||
using Umbraco.Core.Services;
|
||||
using Umbraco.Web.PublishedCache;
|
||||
|
||||
namespace Umbraco.Web.HealthCheck.Checks.DataIntegrity
|
||||
{
|
||||
@@ -14,25 +16,26 @@ namespace Umbraco.Web.HealthCheck.Checks.DataIntegrity
|
||||
"XML Data Integrity",
|
||||
Description = "This checks the data integrity for the xml structures for content, media and members that are stored in the cmsContentXml table. This does not check the data integrity of the xml cache file, only the xml structures stored in the database used to create the xml cache file.",
|
||||
Group = "Data Integrity")]
|
||||
[HideFromTypeFinder] // only if running the Xml cache! added by XmlCacheComponent!
|
||||
public class XmlDataIntegrityHealthCheck : HealthCheck
|
||||
{
|
||||
private readonly ILocalizedTextService _textService;
|
||||
private readonly PublishedCache.XmlPublishedCache.PublishedSnapshotService _publishedSnapshotService;
|
||||
|
||||
private const string CheckContentXmlTableAction = "checkContentXmlTable";
|
||||
private const string CheckMediaXmlTableAction = "checkMediaXmlTable";
|
||||
private const string CheckMembersXmlTableAction = "checkMembersXmlTable";
|
||||
|
||||
public XmlDataIntegrityHealthCheck(ILocalizedTextService textService, IPublishedSnapshotService publishedSnapshotService)
|
||||
public XmlDataIntegrityHealthCheck(HealthCheckContext healthCheckContext) : base(healthCheckContext)
|
||||
{
|
||||
_textService = textService;
|
||||
|
||||
_publishedSnapshotService = publishedSnapshotService as PublishedCache.XmlPublishedCache.PublishedSnapshotService;
|
||||
if (_publishedSnapshotService == null)
|
||||
throw new NotSupportedException("Unsupported IPublishedSnapshotService, only the Xml one is supported.");
|
||||
_sqlSyntax = HealthCheckContext.ApplicationContext.DatabaseContext.SqlSyntax;
|
||||
_services = HealthCheckContext.ApplicationContext.Services;
|
||||
_database = HealthCheckContext.ApplicationContext.DatabaseContext.Database;
|
||||
_textService = healthCheckContext.ApplicationContext.Services.TextService;
|
||||
}
|
||||
|
||||
private readonly ISqlSyntaxProvider _sqlSyntax;
|
||||
private readonly ServiceContext _services;
|
||||
private readonly UmbracoDatabase _database;
|
||||
|
||||
/// <summary>
|
||||
/// Get the status for this health check
|
||||
/// </summary>
|
||||
@@ -53,13 +56,13 @@ namespace Umbraco.Web.HealthCheck.Checks.DataIntegrity
|
||||
switch (action.Alias)
|
||||
{
|
||||
case CheckContentXmlTableAction:
|
||||
_publishedSnapshotService.RebuildContentAndPreviewXml();
|
||||
_services.ContentService.RebuildXmlStructures();
|
||||
return CheckContent();
|
||||
case CheckMediaXmlTableAction:
|
||||
_publishedSnapshotService.RebuildMediaXml();
|
||||
_services.MediaService.RebuildXmlStructures();
|
||||
return CheckMedia();
|
||||
case CheckMembersXmlTableAction:
|
||||
_publishedSnapshotService.RebuildMemberXml();
|
||||
_services.MemberService.RebuildXmlStructures();
|
||||
return CheckMembers();
|
||||
default:
|
||||
throw new ArgumentOutOfRangeException();
|
||||
@@ -68,30 +71,128 @@ namespace Umbraco.Web.HealthCheck.Checks.DataIntegrity
|
||||
|
||||
private HealthCheckStatus CheckMembers()
|
||||
{
|
||||
return Check(_publishedSnapshotService.VerifyMemberXml(), CheckMembersXmlTableAction, "healthcheck/xmlDataIntegrityCheckMembers");
|
||||
var total = _services.MemberService.Count();
|
||||
var memberObjectType = Guid.Parse(Constants.ObjectTypes.Member);
|
||||
var subQuery = new Sql()
|
||||
.Select("Count(*)")
|
||||
.From<ContentXmlDto>(_sqlSyntax)
|
||||
.InnerJoin<NodeDto>(_sqlSyntax)
|
||||
.On<ContentXmlDto, NodeDto>(_sqlSyntax, left => left.NodeId, right => right.NodeId)
|
||||
.Where<NodeDto>(dto => dto.NodeObjectType == memberObjectType);
|
||||
var totalXml = _database.ExecuteScalar<int>(subQuery);
|
||||
|
||||
var actions = new List<HealthCheckAction>();
|
||||
if (totalXml != total)
|
||||
actions.Add(new HealthCheckAction(CheckMembersXmlTableAction, Id));
|
||||
|
||||
return new HealthCheckStatus(_textService.Localize("healthcheck/xmlDataIntegrityCheckMembers", new[] { totalXml.ToString(), total.ToString(), (total - totalXml).ToString() }))
|
||||
{
|
||||
ResultType = totalXml == total ? StatusResultType.Success : StatusResultType.Error,
|
||||
Actions = actions
|
||||
};
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Checks the cmsContentXml table to see if the number of entries for media matches the number of media entities
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
/// <remarks>
|
||||
/// Further to just counting the data integrity, this also checks if the XML stored in the cmsContentXml table contains the correct
|
||||
/// GUID identifier. In older versions of Umbraco, the GUID is not persisted to the content cache, that will cause problems in newer
|
||||
/// versions of Umbraco, so the xml table would need a rebuild.
|
||||
/// </remarks>
|
||||
private HealthCheckStatus CheckMedia()
|
||||
{
|
||||
return Check(_publishedSnapshotService.VerifyMediaXml(), CheckMediaXmlTableAction, "healthcheck/xmlDataIntegrityCheckMedia");
|
||||
var total = _services.MediaService.CountNotTrashed();
|
||||
var mediaObjectType = Guid.Parse(Constants.ObjectTypes.Media);
|
||||
|
||||
//count entries
|
||||
var countTotalSubQuery = new Sql()
|
||||
.Select("Count(*)")
|
||||
.From<ContentXmlDto>(_sqlSyntax)
|
||||
.InnerJoin<NodeDto>(_sqlSyntax)
|
||||
.On<ContentXmlDto, NodeDto>(_sqlSyntax, left => left.NodeId, right => right.NodeId)
|
||||
.Where<NodeDto>(dto => dto.NodeObjectType == mediaObjectType);
|
||||
var totalXml = _database.ExecuteScalar<int>(countTotalSubQuery);
|
||||
|
||||
//count invalid entries
|
||||
var countNonGuidQuery = new Sql()
|
||||
.Select("Count(*)")
|
||||
.From<ContentXmlDto>(_sqlSyntax)
|
||||
.InnerJoin<NodeDto>(_sqlSyntax)
|
||||
.On<ContentXmlDto, NodeDto>(_sqlSyntax, left => left.NodeId, right => right.NodeId)
|
||||
.Where<NodeDto>(dto => dto.NodeObjectType == mediaObjectType)
|
||||
.Where(string.Format("{0}.{1} NOT LIKE '% key=\"%'", _sqlSyntax.GetQuotedTableName("cmsContentXml"), _sqlSyntax.GetQuotedColumnName("xml")));
|
||||
var totalNonGuidXml = _database.ExecuteScalar<int>(countNonGuidQuery);
|
||||
|
||||
var hasError = false;
|
||||
var actions = new List<HealthCheckAction>();
|
||||
if (totalXml != total || totalNonGuidXml > 0)
|
||||
{
|
||||
//if the counts don't match
|
||||
actions.Add(new HealthCheckAction(CheckMediaXmlTableAction, Id));
|
||||
hasError = true;
|
||||
}
|
||||
|
||||
return new HealthCheckStatus(_textService.Localize("healthcheck/xmlDataIntegrityCheckMedia",
|
||||
new[] { totalXml.ToString(), total.ToString(), totalNonGuidXml.ToString() }))
|
||||
{
|
||||
ResultType = hasError == false
|
||||
? StatusResultType.Success
|
||||
: StatusResultType.Error,
|
||||
Actions = actions
|
||||
};
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Checks the cmsContentXml table to see if the number of entries for content matches the number of published content entities
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
/// <remarks>
|
||||
/// Further to just counting the data integrity, this also checks if the XML stored in the cmsContentXml table contains the correct
|
||||
/// GUID identifier. In older versions of Umbraco, the GUID is not persisted to the content cache, that will cause problems in newer
|
||||
/// versions of Umbraco, so the xml table would need a rebuild.
|
||||
/// </remarks>
|
||||
private HealthCheckStatus CheckContent()
|
||||
{
|
||||
return Check(_publishedSnapshotService.VerifyContentAndPreviewXml(), CheckContentXmlTableAction, "healthcheck/xmlDataIntegrityCheckContent");
|
||||
}
|
||||
var total = _services.ContentService.CountPublished();
|
||||
var documentObjectType = Guid.Parse(Constants.ObjectTypes.Document);
|
||||
|
||||
private HealthCheckStatus Check(bool ok, string action, string text)
|
||||
{
|
||||
//count entires
|
||||
var countTotalSubQuery = new Sql()
|
||||
.Select(string.Format("DISTINCT {0}.{1}", _sqlSyntax.GetQuotedTableName("cmsContentXml"), _sqlSyntax.GetQuotedColumnName("nodeId")))
|
||||
.From<ContentXmlDto>(_sqlSyntax)
|
||||
.InnerJoin<DocumentDto>(_sqlSyntax)
|
||||
.On<DocumentDto, ContentXmlDto>(_sqlSyntax, left => left.NodeId, right => right.NodeId);
|
||||
var totalXml = _database.ExecuteScalar<int>("SELECT COUNT(*) FROM (" + countTotalSubQuery.SQL + ") as tmp");
|
||||
|
||||
//count invalid entries
|
||||
var countNonGuidQuery = new Sql()
|
||||
.Select("Count(*)")
|
||||
.From<ContentXmlDto>(_sqlSyntax)
|
||||
.InnerJoin<NodeDto>(_sqlSyntax)
|
||||
.On<ContentXmlDto, NodeDto>(_sqlSyntax, left => left.NodeId, right => right.NodeId)
|
||||
.Where<NodeDto>(dto => dto.NodeObjectType == documentObjectType)
|
||||
.Where(string.Format("{0}.{1} NOT LIKE '% key=\"%'", _sqlSyntax.GetQuotedTableName("cmsContentXml"), _sqlSyntax.GetQuotedColumnName("xml")));
|
||||
var totalNonGuidXml = _database.ExecuteScalar<int>(countNonGuidQuery);
|
||||
|
||||
var hasError = false;
|
||||
var actions = new List<HealthCheckAction>();
|
||||
if (ok == false)
|
||||
actions.Add(new HealthCheckAction(action, Id));
|
||||
|
||||
return new HealthCheckStatus(_textService.Localize(text, new[] { ok ? "ok" : "not ok" }))
|
||||
if (totalXml != total || totalNonGuidXml > 0)
|
||||
{
|
||||
ResultType = ok ? StatusResultType.Success : StatusResultType.Error,
|
||||
//if the counts don't match
|
||||
actions.Add(new HealthCheckAction(CheckContentXmlTableAction, Id));
|
||||
hasError = true;
|
||||
}
|
||||
|
||||
return new HealthCheckStatus(_textService.Localize("healthcheck/xmlDataIntegrityCheckContent",
|
||||
new[] { totalXml.ToString(), total.ToString(), totalNonGuidXml.ToString() }))
|
||||
{
|
||||
ResultType = hasError == false
|
||||
? StatusResultType.Success
|
||||
: StatusResultType.Error,
|
||||
Actions = actions
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user