fix: properly initialize rabbit health check

aneoconsulting · Oct 25, 2024 · 58ebe56 · 58ebe56
1 parent e0f7b19
commit 58ebe56
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/Adaptors/RabbitMQ/src/ConnectionRabbit.cs b/Adaptors/RabbitMQ/src/ConnectionRabbit.cs
@@ -41,7 +41,6 @@ public class ConnectionRabbit : IConnectionRabbit
   private readonly ConnectionFactory           factory_;
   private readonly ILogger<ConnectionRabbit>   logger_;
   private readonly Amqp                        options_;
-  private          bool                        isInitialized_;
   private          IModel?                     model_;
 
   public ConnectionRabbit(Amqp                      options,
@@ -65,10 +64,10 @@ public Task Init(CancellationToken cancellationToken = default)
   public Task<HealthCheckResult> Check(HealthCheckTag tag)
     => tag switch
        {
-         HealthCheckTag.Startup or HealthCheckTag.Readiness => Task.FromResult(isInitialized_
+         HealthCheckTag.Startup or HealthCheckTag.Readiness => Task.FromResult(model_ is not null
                                                                                  ? HealthCheckResult.Healthy()
                                                                                  : HealthCheckResult.Unhealthy($"{nameof(ConnectionRabbit)} is not yet initialized.")),
-         HealthCheckTag.Liveness => Task.FromResult(isInitialized_ && model_ is not null && model_.IsOpen
+         HealthCheckTag.Liveness => Task.FromResult(model_ is not null && model_.IsOpen
                                                       ? HealthCheckResult.Healthy()
                                                       : HealthCheckResult.Unhealthy($"{nameof(ConnectionRabbit)} not initialized or connection dropped.")),
          _ => throw new ArgumentOutOfRangeException(nameof(tag),
@@ -78,11 +77,8 @@ public Task<HealthCheckResult> Check(HealthCheckTag tag)
 
   public void Dispose()
   {
-    if (isInitialized_)
-    {
-      model_!.Close();
-      model_!.Dispose();
-    }
+    model_?.Close();
+    model_?.Dispose();
 
     connectionSingleizer_.Dispose();