Merge branch 'master' of https://github.com/DroneDB/Registry

DroneDB · Nov 26, 2024 · 848c428 · 848c428
2 parents 2cfa8c7 + dc20a11
commit 848c428
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/Registry.Ports/ICacheManager.cs b/Registry.Ports/ICacheManager.cs
@@ -13,7 +13,7 @@ public interface ICacheManager
 
     void Set(string seed, string category, string data, params object[] parameters);
 
-    Task Clear(string seed, string category = null);
+    void Clear(string seed, string category = null);
     void Remove(string seed, string category, params object[] parameters);
 
     bool IsRegistered(string seed);

diff --git a/Registry.Web/Registry.Web.csproj b/Registry.Web/Registry.Web.csproj
@@ -6,11 +6,11 @@
         <UserSecretsId>4e006835-31cb-47c5-9dfe-7b73e210db92</UserSecretsId>
         <SpaRoot>ClientApp\</SpaRoot>
         <DefaultItemExcludes>$(DefaultItemExcludes);$(SpaRoot)node_modules\**</DefaultItemExcludes>
-        <AssemblyVersion>1.1.9</AssemblyVersion>
-        <FileVersion>1.1.9</FileVersion>
+        <AssemblyVersion>1.1.10</AssemblyVersion>
+        <FileVersion>1.1.10</FileVersion>
         <Version>1.1.7</Version>
         <Platforms>AnyCPU;x64</Platforms>
-        <PackageVersion>1.1.9</PackageVersion>
+        <PackageVersion>1.1.10</PackageVersion>
         <Configurations>Debug;Release;DebugEf</Configurations>
         <DdbVersion>1.0.12</DdbVersion>
     </PropertyGroup>

diff --git a/Registry.Web/Services/Managers/CacheManager.cs b/Registry.Web/Services/Managers/CacheManager.cs
@@ -129,15 +129,16 @@ public void Set(string seed, string category, string data, params object[] param
         _cache.Set(key, data, policy);
     }
 
-    public Task Clear(string seed, string category = null)
+    public void Clear(string seed, string category = null)
     {
-        return Task.Run(() =>
-        {
-            var k = category != null ? MakeKey(seed, category, null) : seed;
-            var keys = _cache.Where(o => o.Key.StartsWith(k)).Select(o => o.Key).ToArray();
-
-            foreach (var key in keys)
-                _cache.Remove(key);
-        });
+        ArgumentNullException.ThrowIfNull(seed);
+        var k = category != null ? MakeKey(seed, category, null) : seed;
+
+        var keys = _cache.Where(o => o.Key != null && o.Key.StartsWith(k))
+            .Select(o => o.Key).ToArray();
+
+        foreach (var key in keys)
+            _cache.Remove(key);
+
     }
 }
diff --git a/Registry.Web/Services/Managers/ObjectsManager.cs b/Registry.Web/Services/Managers/ObjectsManager.cs
@@ -370,8 +370,8 @@ public async Task Delete(string orgSlug, string dsSlug, string path)
 
                 _fs.Delete(objLocalPath);
 
-                await _cacheManager.Clear(MagicStrings.ThumbnailCacheSeed, obj.Hash);
-                await _cacheManager.Clear(MagicStrings.TileCacheSeed, obj.Hash);
+                _cacheManager.Clear(MagicStrings.ThumbnailCacheSeed, obj.Hash);
+                _cacheManager.Clear(MagicStrings.TileCacheSeed, obj.Hash);
             }
             catch (Exception ex)
             {