Fix issue where we dispose the PollAndSubscribeToResponse before we delete the response from redis

Author: LukeButters

source/Halibut/Queue/Redis/PollAndSubscribeToResponse.cs

@@ -153,39 +153,46 @@ public async Task<bool> TryGetResponseFromRedis(string detectedBy, CancellationT
 
             if (ResponseJsonCompletionSource.Task.IsCompleted) return true;
 
+            // TODO wrap in try
             var responseJson = await halibutRedisTransport.GetResponseMessage(endpoint, activityId, token);
+            
             if (responseJson != null)
             {
-                log.Write(EventType.Diagnostic, "Response detected  via {0} - Endpoint: {1}, ActivityId: {2}", detectedBy, endpoint, activityId);
-                await TrySetResponse(responseJson, token);
+                log.Write(EventType.Diagnostic, "Response detected via {0} - Endpoint: {1}, ActivityId: {2}", detectedBy, endpoint, activityId);
+                
+                await DeleteResponseFromRedis(detectedBy, token);
+                
+                TrySetResponse(responseJson, token);
                 await Try.IgnoringError(async () => await watcherToken.CancelAsync());
                 log.Write(EventType.Diagnostic, "Cancelling  polling loop for response - Endpoint: {0}, ActivityId: {1}", endpoint, activityId);
                 return true;
             }
 
             return false;
         }
-        
-        async Task TrySetResponse(string value, CancellationToken cancellationToken)
+
+        async Task DeleteResponseFromRedis(string detectedBy, CancellationToken token)
         {
             try
             {
-                ResponseJsonCompletionSource.TrySetResult(value);
+                await halibutRedisTransport.DeleteResponse(endpoint, activityId, token);
             }
             catch (Exception ex)
             {
-                log.Write(EventType.Error, "Failed to set response - Endpoint: {0}, ActivityId: {1}, Error: {2}", endpoint, activityId, ex.Message);
+                log.Write(EventType.Error, "Failed to delete response from Redis via {0} - Endpoint: {1}, ActivityId: {2}, Error: {3}", detectedBy, endpoint, activityId, ex.Message);
             }
+        }
 
+        void TrySetResponse(string value, CancellationToken cancellationToken)
+        {
             try
             {
-                await halibutRedisTransport.DeleteResponse(endpoint, activityId, cancellationToken);
+                ResponseJsonCompletionSource.TrySetResult(value);
             }
             catch (Exception ex)
             {
-                log.Write(EventType.Error, "Failed to delete response from Redis - Endpoint: {0}, ActivityId: {1}, Error: {2}", endpoint, activityId, ex.Message);
+                log.Write(EventType.Error, "Failed to set response - Endpoint: {0}, ActivityId: {1}, Error: {2}", endpoint, activityId, ex.Message);
             }
-
         }
 
         public async ValueTask DisposeAsync()

source/Halibut/Util/CancelOnDisposeCancellationToken.cs

@@ -16,7 +16,7 @@ public sealed class CancelOnDisposeCancellationToken : IAsyncDisposable
         readonly CancellationTokenSource cancellationTokenSource;
         bool disposed;
 
-        AwaitAllAndIgnoreException awaitAllAndIgnoreException = new AwaitAllAndIgnoreException();
+        readonly AwaitAllAndIgnoreException awaitAllAndIgnoreException = new();
 
         public CancelOnDisposeCancellationToken(params CancellationToken[] token)
         : this(CancellationTokenSource.CreateLinkedTokenSource(token))