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

removes the test suspendable model factory code

Browse Source
This commit is contained in:
Shannon
2019-09-16 16:59:57 +10:00
parent bc40216eca
commit 47d3af9bb3
6 changed files with 6 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Core/Packaging/PackageDataInstallation.cs
View File

@@ -28,15 +28,13 @@ namespace Umbraco.Core.Packaging
private readonly IDataTypeService _dataTypeService;
private readonly PropertyEditorCollection _propertyEditors;
private readonly IScopeProvider _scopeProvider;
private readonly IPublishedModelFactory _publishedModelFactory;
private readonly IEntityService _entityService;
private readonly IContentTypeService _contentTypeService;
private readonly IContentService _contentService;
public PackageDataInstallation(ILogger logger, IFileService fileService, IMacroService macroService, ILocalizationService localizationService,
IDataTypeService dataTypeService, IEntityService entityService, IContentTypeService contentTypeService,
IContentService contentService, PropertyEditorCollection propertyEditors, IScopeProvider scopeProvider,
IPublishedModelFactory publishedModelFactory)
IContentService contentService, PropertyEditorCollection propertyEditors, IScopeProvider scopeProvider)
{
_logger = logger;
_fileService = fileService;
@@ -45,7 +43,6 @@ namespace Umbraco.Core.Packaging
_dataTypeService = dataTypeService;
_propertyEditors = propertyEditors;
_scopeProvider = scopeProvider;
_publishedModelFactory = publishedModelFactory;
_entityService = entityService;
_contentTypeService = contentTypeService;
_contentService = contentService;

94
src/Umbraco.Core/PublishedModelFactoryExtensions.cs
View File

@@ -28,17 +28,9 @@ namespace Umbraco.Core
{
lock (liveFactory.SyncRoot)
{
//if (_suspend != null)
//{
// //if we are currently suspended, queue the action
// _suspend.Queue(action);
//}
//else
//{
//Call refresh on the live factory to re-compile the models
liveFactory.Refresh();
action();
//}
//Call refresh on the live factory to re-compile the models
liveFactory.Refresh();
action();
}
}
else
@@ -103,85 +95,5 @@ namespace Umbraco.Core
private static volatile bool _refresh = false;
//public static IDisposable SuspendSafeLiveFactory(this IPublishedModelFactory factory)
//{
// if (factory is ILivePublishedModelFactory liveFactory)
// {
// lock (liveFactory.SyncRoot)
// {
// if (_suspend == null)
// {
// _suspend = new SuspendSafeLiveFactory(
// factory,
// () => _suspend = null); //reset when it's done
// }
// return _suspend;
// }
// }
// else
// {
// return new SuspendSafeLiveFactory(factory); //returns a noop version of IDisposable, this won't actually do anything
// }
//}
//private static SuspendSafeLiveFactory _suspend;
}
internal class SuspendSafeLiveFactory : IDisposable
{
private readonly IPublishedModelFactory _factory;
private readonly Action _reset;
private readonly List<Action> _actions = new List<Action>();
public SuspendSafeLiveFactory(IPublishedModelFactory factory, Action reset = null)
{
_factory = factory;
_reset = reset;
}
/// <summary>
/// Queue an action to execute on disposal after rebuild
/// </summary>
/// <param name="action"></param>
public void Queue(Action action)
{
_actions.Add(action);
}
#region IDisposable Support
private bool disposedValue = false; // To detect redundant calls
protected virtual void Dispose(bool disposing)
{
if (!disposedValue)
{
if (disposing)
{
if (_factory is ILivePublishedModelFactory liveFactory)
{
lock (liveFactory.SyncRoot)
{
//Call refresh on the live factory to re-compile the models
liveFactory.Refresh();
//then we need to call all queued actions
foreach(var action in _actions)
action();
}
}
_reset?.Invoke();
}
disposedValue = true;
}
}
// This code added to correctly implement the disposable pattern.
public void Dispose()
{
// Do not change this code. Put cleanup code in Dispose(bool disposing) above.
Dispose(true);
}
#endregion
}
}

1
src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs
View File

@@ -90,7 +90,6 @@ namespace Umbraco.Web.Cache
// service of changes, else factories may try to rebuild models while
// we are using the database to load content into caches
//_publishedModelFactory.WithSafeLiveFactory(() =>
_publishedModelFactory.WithSafeLiveFactoryRefreshSet(() =>
_publishedSnapshotService.Notify(payloads));

1
src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs
View File

@@ -66,7 +66,6 @@ namespace Umbraco.Web.Cache
// service of changes, else factories may try to rebuild models while
// we are using the database to load content into caches
//_publishedModelFactory.WithSafeLiveFactory(() =>
_publishedModelFactory.WithSafeLiveFactoryRefreshSet(() =>
_publishedSnapshotService.Notify(payloads));

6
src/Umbraco.Web/Editors/ContentTypeController.cs
View File

@@ -49,7 +49,6 @@ namespace Umbraco.Web.Editors
private readonly IEntityXmlSerializer _serializer;
private readonly PropertyEditorCollection _propertyEditors;
private readonly IScopeProvider _scopeProvider;
private readonly IPublishedModelFactory _publishedModelFactory;
public ContentTypeController(IEntityXmlSerializer serializer,
ICultureDictionaryFactory cultureDictionaryFactory,
@@ -58,13 +57,12 @@ namespace Umbraco.Web.Editors
ISqlContext sqlContext, PropertyEditorCollection propertyEditors,
ServiceContext services, AppCaches appCaches,
IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper,
IScopeProvider scopeProvider, IPublishedModelFactory publishedModelFactory)
IScopeProvider scopeProvider)
: base(cultureDictionaryFactory, globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper)
{
_serializer = serializer;
_propertyEditors = propertyEditors;
_scopeProvider = scopeProvider;
_publishedModelFactory = publishedModelFactory;
}
public int GetCount()
@@ -527,7 +525,7 @@ namespace Umbraco.Web.Editors
}
var dataInstaller = new PackageDataInstallation(Logger, Services.FileService, Services.MacroService, Services.LocalizationService,
Services.DataTypeService, Services.EntityService, Services.ContentTypeService, Services.ContentService, _propertyEditors, _scopeProvider, _publishedModelFactory);
Services.DataTypeService, Services.EntityService, Services.ContentTypeService, Services.ContentService, _propertyEditors, _scopeProvider);
var xd = new XmlDocument {XmlResolver = null};
xd.Load(filePath);

2
src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
View File

@@ -790,8 +790,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
Notify<IContentType>(_contentStore, payloads, RefreshContentTypesLocked);
Notify<IMediaType>(_mediaStore, payloads, RefreshMediaTypesLocked);
//TODO: I don't think this is necessary with the changes to nucache now that calls to `CreateModel` are lazy?
// but I may be dreaming here, if i remove this call and save a content type, then the cache doesn't render a lot of the content. hrm.
if (_publishedModelFactory.IsLiveFactory())
{
//In the case of Pure Live - we actually need to refresh all of the content and the media