Ensure we clean the keyCache after a report.

KevinJump · May 13, 2020 · 6dcc74b · 6dcc74b
1 parent 1162da0
commit 6dcc74b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/Dist/package.cmd b/Dist/package.cmd
@@ -1,7 +1,7 @@
 @echo off 
 
-SET config=release
-REM SET config=debug
+REM SET config=release
+SET config=debug
 
 @Echo Packaging for %config%
 nuget pack ..\uSync8.Core\uSync.Core.nuspec -build  -OutputDirectory %1 -version %1 -properties "depends=%1;Configuration=%config%"

diff --git a/uSync8.BackOffice/Services/uSyncService.cs b/uSync8.BackOffice/Services/uSyncService.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-
+using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;

diff --git a/uSync8.BackOffice/SyncHandlers/SyncHandlerBase.cs b/uSync8.BackOffice/SyncHandlers/SyncHandlerBase.cs
@@ -342,10 +342,10 @@ protected virtual IEnumerable<uSyncAction> CleanFolder(string cleanFile, bool re
         /// </remarks>
         private IList<Guid> GetFolderKeys(string folder, bool flat)
         {
-            // if it's flat, then we only need to load all the keys once per handler
-            var folderKey = flat == true ? 1 : folder.GetHashCode();
+            // We only need to load all the keys once per handler (if all items are in a folder that key will be used).
+            var folderKey = folder.GetHashCode();
 
-            var cacheKey = $"uSyncKeyList_{folderKey}_{this.Alias}";
+            var cacheKey = $"keycache_{this.Alias}_{folderKey}";
             return runtimeCache.GetCacheItem(cacheKey, () =>
             {
                 var keys = new List<Guid>();
@@ -574,12 +574,16 @@ public IEnumerable<uSyncAction> Report(string folder, HandlerSettings config, Sy
         {
             var actions = new List<uSyncAction>();
 
+            runtimeCache.ClearByKey($"keycache_{this.Alias}");
+
             callback?.Invoke("Checking Actions", 1, 3);
             actions.AddRange(ReportFolder(folder, config, callback));
 
             callback?.Invoke("Validating Report", 2, 3);
             actions = ValidateReport(folder, actions);
 
+            runtimeCache.ClearByKey($"keycache_{this.Alias}");
+
             callback?.Invoke("Done", 3, 3);
             return actions;
         }