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

Merge pull request #10846 from umbraco/v9/bugfix/resolve-issues-adding-content-on-startup

Browse Source 
Resolve issues adding content on startup for #10774
This commit is contained in:
Bjarke Berg
2021-08-17 14:29:57 +02:00
committed by GitHub
parent 26a79c097e 2c0761346c
commit 794cddffd4
1 changed files with 5 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/Umbraco.PublishedCache.NuCache/PublishedSnapshotService.cs
View File

@@ -219,36 +219,6 @@ namespace Umbraco.Cms.Infrastructure.PublishedCache
return path;
}
private void DeleteLocalFilesForContent()
{
if (Volatile.Read(ref _isReady) && _localContentDb != null)
{
throw new InvalidOperationException("Cannot delete local files while the cache uses them.");
}
var path = GetLocalFilesPath();
var localContentDbPath = Path.Combine(path, "NuCache.Content.db");
if (File.Exists(localContentDbPath))
{
File.Delete(localContentDbPath);
}
}
private void DeleteLocalFilesForMedia()
{
if (Volatile.Read(ref _isReady) && _localMediaDb != null)
{
throw new InvalidOperationException("Cannot delete local files while the cache uses them.");
}
var path = GetLocalFilesPath();
var localMediaDbPath = Path.Combine(path, "NuCache.Media.db");
if (File.Exists(localMediaDbPath))
{
File.Delete(localMediaDbPath);
}
}
/// <summary>
/// Lazily populates the stores only when they are first requested
/// </summary>
@@ -518,13 +488,7 @@ namespace Umbraco.Cms.Infrastructure.PublishedCache
public void Notify(ContentCacheRefresher.JsonPayload[] payloads, out bool draftChanged, out bool publishedChanged)
{
// no cache, trash everything
if (Volatile.Read(ref _isReady) == false)
{
DeleteLocalFilesForContent();
draftChanged = publishedChanged = true;
return;
}
EnsureCaches();
using (_contentStore.GetScopedWriteLock(_scopeProvider))
{
@@ -619,13 +583,7 @@ namespace Umbraco.Cms.Infrastructure.PublishedCache
/// <inheritdoc />
public void Notify(MediaCacheRefresher.JsonPayload[] payloads, out bool anythingChanged)
{
// no cache, trash everything
if (Volatile.Read(ref _isReady) == false)
{
DeleteLocalFilesForMedia();
anythingChanged = true;
return;
}
EnsureCaches();
using (_mediaStore.GetScopedWriteLock(_scopeProvider))
{
@@ -717,11 +675,7 @@ namespace Umbraco.Cms.Infrastructure.PublishedCache
/// <inheritdoc />
public void Notify(ContentTypeCacheRefresher.JsonPayload[] payloads)
{
// no cache, nothing we can do
if (Volatile.Read(ref _isReady) == false)
{
return;
}
EnsureCaches();
foreach (var payload in payloads)
{
@@ -817,11 +771,7 @@ namespace Umbraco.Cms.Infrastructure.PublishedCache
public void Notify(DataTypeCacheRefresher.JsonPayload[] payloads)
{
// no cache, nothing we can do
if (Volatile.Read(ref _isReady) == false)
{
return;
}
EnsureCaches();
var idsA = payloads.Select(x => x.Id).ToArray();
@@ -861,11 +811,7 @@ namespace Umbraco.Cms.Infrastructure.PublishedCache
public void Notify(DomainCacheRefresher.JsonPayload[] payloads)
{
// no cache, nothing we can do
if (Volatile.Read(ref _isReady) == false)
{
return;
}
EnsureCaches();
// see note in LockAndLoadContent
using (_domainStore.GetScopedWriteLock(_scopeProvider))