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

NuCache: cleanup scoped objects

Browse Source
This commit is contained in:
Stephan
2019-02-22 15:27:22 +01:00
parent edb8340b32
commit 541c7e6955
2 changed files with 48 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -330,14 +330,15 @@ namespace Umbraco.Web.PublishedCache.NuCache
private void LockAndLoadContent(Action<IScope> action)
{
// first get a writer, then a scope
// if there already is a scope, the writer will attach to it
// otherwise, it will only exist here - cheap
using (_contentStore.GetWriter(_scopeProvider))
using (var scope = _scopeProvider.CreateScope())
{
using (var scope = _scopeProvider.CreateScope())
{
scope.ReadLock(Constants.Locks.ContentTree);
action(scope);
scope.Complete();
}
scope.ReadLock(Constants.Locks.ContentTree);
action(scope);
scope.Complete();
}
}
@@ -399,14 +400,13 @@ namespace Umbraco.Web.PublishedCache.NuCache
private void LockAndLoadMedia(Action<IScope> action)
{
// see note in LockAndLoadContent
using (_mediaStore.GetWriter(_scopeProvider))
using (var scope = _scopeProvider.CreateScope())
{
using (var scope = _scopeProvider.CreateScope())
{
scope.ReadLock(Constants.Locks.MediaTree);
action(scope);
scope.Complete();
}
scope.ReadLock(Constants.Locks.MediaTree);
action(scope);
scope.Complete();
}
}
@@ -528,14 +528,13 @@ namespace Umbraco.Web.PublishedCache.NuCache
private void LockAndLoadDomains()
{
// see note in LockAndLoadContent
using (_domainStore.GetWriter(_scopeProvider))
using (var scope = _scopeProvider.CreateScope())
{
using (var scope = _scopeProvider.CreateScope())
{
scope.ReadLock(Constants.Locks.Domains);
LoadDomainsLocked();
scope.Complete();
}
scope.ReadLock(Constants.Locks.Domains);
LoadDomainsLocked();
scope.Complete();
}
}
@@ -858,6 +857,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
if (_isReady == false)
return;
// see note in LockAndLoadContent
using (_domainStore.GetWriter(_scopeProvider))
{
foreach (var payload in payloads)