HybridCache no longer nullrefs if SupportData is missing.

Author: lilith

src/Imazen.HybridCache/HybridCache.cs

@@ -6,11 +6,12 @@
 using Imazen.Common.Extensibility.Support;
 using Imazen.Common.Issues;
 using Imazen.HybridCache.MetaStore;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
 namespace Imazen.HybridCache
 {
-    public class HybridCache : IBlobCache
+    public class HybridCache : IBlobCache, IHostedService
     {
         private readonly IReLogger logger;
         private HashBasedPathBuilder PathBuilder { get; }
@@ -97,10 +98,8 @@ private void FillMoveFileOverwriteFunc(HybridCacheAdvancedOptions options)
                 File.Move(from, to);
 #endif
             };
-            options.CleanupManagerOptions.MoveFileOverwriteFunc = options.CleanupManagerOptions.MoveFileOverwriteFunc ??
-                                                                  options.AsyncCacheOptions.MoveFileOverwriteFunc ?? moveFileOverwriteFunc;
-            options.AsyncCacheOptions.MoveFileOverwriteFunc = options.AsyncCacheOptions.MoveFileOverwriteFunc ??
-                                                              options.CleanupManagerOptions.MoveFileOverwriteFunc ?? moveFileOverwriteFunc;
+            options.CleanupManagerOptions.MoveFileOverwriteFunc ??= options.AsyncCacheOptions.MoveFileOverwriteFunc ?? moveFileOverwriteFunc;
+            options.AsyncCacheOptions.MoveFileOverwriteFunc ??= options.CleanupManagerOptions.MoveFileOverwriteFunc ?? moveFileOverwriteFunc;
         }
 
 
@@ -118,7 +117,10 @@ public async Task StopAsync(CancellationToken cancellationToken)
         {
             logger?.LogInformation("HybridCache is shutting down...");
             var sw = Stopwatch.StartNew();
-            await SupportData.AwaitBeforeShutdown();
+            if (SupportData != null)
+            {
+                await SupportData.AwaitBeforeShutdown();
+            }
             await Database.StopAsync(cancellationToken);
             sw.Stop();
             logger?.LogInformation("HybridCache shut down in {ShutdownTime}", sw.Elapsed);

tests/Imazen.HybridCache.Tests/HybridCacheTests.cs

@@ -24,7 +24,6 @@ public async Task SmokeTest()
             {
                 AsyncCacheOptions = new AsyncCacheOptions
                 {
-                    MaxQueuedBytes = 0,
                     UniqueName = "HybridCache"
                 }
             };