Refactoring RabbitService constructor to be more UnitTest friendly.

houseofcat · Apr 24, 2024 · 776214d · 776214d
1 parent 52786f0
commit 776214d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 32 deletions.
diff --git a/src/HouseofCat.RabbitMQ/Services/Extensions/RabbitServiceExtensions.cs b/src/HouseofCat.RabbitMQ/Services/Extensions/RabbitServiceExtensions.cs
@@ -103,7 +103,7 @@ public static async Task<RabbitService> BuildRabbitServiceAsync(
             compressionProvider,
             loggerFactory);
 
-        await rabbitService.Publisher.StartAutoPublishAsync();
+        await rabbitService.StartAsync();
 
         return rabbitService;
     }

diff --git a/src/HouseofCat.RabbitMQ/Services/RabbitService.cs b/src/HouseofCat.RabbitMQ/Services/RabbitService.cs
@@ -77,47 +77,26 @@ public RabbitService(
         CompressionProvider = compressionProvider;
     }
 
-    public RabbitService(
-        string fileNamePath,
-        ISerializationProvider serializationProvider,
-        IEncryptionProvider encryptionProvider = null,
-        ICompressionProvider compressionProvider = null,
-        ILoggerFactory loggerFactory = null,
-        Func<IPublishReceipt, ValueTask> processReceiptAsync = null)
-        : this(
-              JsonFileReader
-                .ReadFileAsync<RabbitOptions>(fileNamePath)
-                .GetAwaiter()
-                .GetResult(),
-              serializationProvider,
-              encryptionProvider,
-              compressionProvider,
-              loggerFactory,
-              processReceiptAsync)
-    { }
-
     public RabbitService(
         RabbitOptions options,
         ISerializationProvider serializationProvider,
         IEncryptionProvider encryptionProvider = null,
         ICompressionProvider compressionProvider = null,
-        ILoggerFactory loggerFactory = null,
-        Func<IPublishReceipt, ValueTask> processReceiptAsync = null) : this(
+        ILoggerFactory loggerFactory = null)
+        : this(
             new ChannelPool(options),
             serializationProvider,
             encryptionProvider,
             compressionProvider,
-            loggerFactory,
-            processReceiptAsync)
+            loggerFactory)
     { }
 
     public RabbitService(
         IChannelPool chanPool,
         ISerializationProvider serializationProvider,
         IEncryptionProvider encryptionProvider = null,
         ICompressionProvider compressionProvider = null,
-        ILoggerFactory loggerFactory = null,
-        Func<IPublishReceipt, ValueTask> processReceiptAsync = null)
+        ILoggerFactory loggerFactory = null)
     {
         Guard.AgainstNull(chanPool, nameof(chanPool));
         Guard.AgainstNull(serializationProvider, nameof(serializationProvider));
@@ -136,14 +115,20 @@ public RabbitService(
         };
 
         Topologer = new Topologer(ChannelPool);
+    }
 
-        BuildConsumers();
-
-        Publisher.StartAutoPublish(processReceiptAsync);
+    public async Task StartAsync(Func<IPublishReceipt, ValueTask> processReceiptAsync = null)
+    {
+        if (await _serviceLock.WaitAsync(0).ConfigureAwait(false)) return;
 
-        BuildConsumerTopologyAsync()
-            .GetAwaiter()
-            .GetResult();
+        try
+        {
+            BuildConsumers();
+            await BuildConsumerTopologyAsync();
+            Publisher.StartAutoPublish(processReceiptAsync);
+        }
+        finally
+        { _serviceLock.Release(); }
     }
 
     public async ValueTask ShutdownAsync(bool immediately)