Cleanup

houseofcat · Mar 17, 2024 · 16e79eb · 16e79eb
1 parent 0e9f5a2
commit 16e79eb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/HouseofCat.RabbitMQ.Dataflows/ConsumerBlock.cs b/src/HouseofCat.RabbitMQ.Dataflows/ConsumerBlock.cs
@@ -47,7 +47,7 @@ public async Task StartConsumingAsync()
     {
         _cts = new CancellationTokenSource();
         await _consumer.StartConsumerAsync().ConfigureAwait(false);
-        _bufferProcessor = PushToBufferAsync(_cts.Token);
+        _bufferProcessor = PushToBufferBlockAsync(_cts.Token);
     }
 
     public async Task StopConsumingAsync(bool immediate = false)
@@ -93,7 +93,7 @@ public bool ReserveMessage(DataflowMessageHeader messageHeader, ITargetBlock<TOu
     }
 
     // Fast
-    protected virtual async Task PushToBufferAsync(CancellationToken token = default)
+    protected virtual async Task PushToBufferBlockAsync(CancellationToken token = default)
     {
         try
         {

diff --git a/src/HouseofCat.RabbitMQ/Consumer/Consumer.cs b/src/HouseofCat.RabbitMQ/Consumer/Consumer.cs
@@ -126,13 +126,12 @@ public async Task StartConsumerAsync()
                     });
 
                 await Task.Yield();
-                bool success;
-                do
+                var success = false;
+                while (!success)
                 {
                     _logger.LogTrace(Consumers.StartingConsumerLoop, ConsumerOptions.ConsumerName);
                     success = await StartConsumingAsync().ConfigureAwait(false);
                 }
-                while (!success);
 
                 _logger.LogDebug(Consumers.Started, ConsumerOptions.ConsumerName);
 
@@ -433,11 +432,12 @@ await Task.Delay(Options.PoolOptions.SleepOnErrorInterval)
         }
 
         if (!channelHealthy)
-        {   // This is an inner infinite loop, until Channel is healthy/rebuilt.
+        {
             _logger.LogWarning(
                 Consumers.ConsumerChannelReplacedEvent,
                 ConsumerOptions.ConsumerName);
 
+            // This is an inner infinite loop, until Channel is healthy/rebuilt.
             await _chanHost
                 .WaitUntilChannelIsReadyAsync(Options.PoolOptions.SleepOnErrorInterval)
                 .ConfigureAwait(false);