Restore RemoveTopicSubscriptionAsync for two-phase dispose lifecycle

niemyjski · niemyjski · commit 4e620c376c8d · 2026-04-15T12:21:19.000-05:00
diff --git a/src/Foundatio.AWS/Messaging/SQSMessageBus.cs b/src/Foundatio.AWS/Messaging/SQSMessageBus.cs
@@ -383,7 +383,7 @@ await _sqsClient.Value.SetQueueAttributesAsync(new SetQueueAttributesRequest
         }
     }
 
-    protected override async Task CleanupAsync()
+    protected override async Task RemoveTopicSubscriptionAsync()
     {
         if (_subscriberCts is not null)
         {
@@ -416,7 +416,10 @@ protected override async Task CleanupAsync()
                 _logger.LogWarning(ex, "Error waiting for subscriber task to complete during dispose");
             }
         }
+    }
 
+    protected override async Task CleanupAsync()
+    {
         _subscriberCts?.Dispose();
 
         if (!String.IsNullOrEmpty(_subscriptionArn) && _snsClient.IsValueCreated)

Original file line number	Diff line number	Diff line change
`@@ -383,7 +383,7 @@ await _sqsClient.Value.SetQueueAttributesAsync(new SetQueueAttributesRequest`
`383`	`383`	`}`
`384`	`384`	`}`
`385`	`385`
`386`		`- protected override async Task CleanupAsync()`
	`386`	`+ protected override async Task RemoveTopicSubscriptionAsync()`
`387`	`387`	`{`
`388`	`388`	`if (_subscriberCts is not null)`
`389`	`389`	`{`
`@@ -416,7 +416,10 @@ protected override async Task CleanupAsync()`
`416`	`416`	`_logger.LogWarning(ex, "Error waiting for subscriber task to complete during dispose");`
`417`	`417`	`}`
`418`	`418`	`}`
	`419`	`+ }`
`419`	`420`
	`421`	`+ protected override async Task CleanupAsync()`
	`422`	`+ {`
`420`	`423`	`_subscriberCts?.Dispose();`
`421`	`424`
`422`	`425`	`if (!String.IsNullOrEmpty(_subscriptionArn) && _snsClient.IsValueCreated)`