* Finish up TODOs

lukebakken · lukebakken · commit f9dbe3e1d94b · 2024-05-02T17:02:25.000-07:00
diff --git a/projects/RabbitMQ.Client/client/impl/AutorecoveringConnection.Recovery.cs b/projects/RabbitMQ.Client/client/impl/AutorecoveringConnection.Recovery.cs
@@ -286,7 +286,7 @@ await ch.CloseAsync(cancellationToken)
                         try
                         {
                             _recordedEntitiesSemaphore.Release();
-                            // TODO maybe cancellation token
+                            // FUTURE (?) cancellation token
                             await _config.TopologyRecoveryExceptionHandler.ExchangeRecoveryExceptionHandlerAsync(recordedExchange, ex, this)
                                 .ConfigureAwait(false);
                         }
@@ -375,7 +375,7 @@ await _recordedEntitiesSemaphore.WaitAsync(cancellationToken)
                         try
                         {
                             _recordedEntitiesSemaphore.Release();
-                            // TODO maybe cancellation token
+                            // FUTURE (?) cancellation token
                             await _config.TopologyRecoveryExceptionHandler.QueueRecoveryExceptionHandlerAsync(recordedQueue, ex, this)
                                 .ConfigureAwait(false);
                         }
@@ -449,7 +449,7 @@ await ch.CloseAsync(cancellationToken)
                         try
                         {
                             _recordedEntitiesSemaphore.Release();
-                            // TODO maybe cancellation token
+                            // FUTURE (?) cancellation token
                             await _config.TopologyRecoveryExceptionHandler.BindingRecoveryExceptionHandlerAsync(binding, ex, this)
                                 .ConfigureAwait(false);
                         }
diff --git a/projects/RabbitMQ.Client/client/impl/ChannelBase.cs b/projects/RabbitMQ.Client/client/impl/ChannelBase.cs
@@ -242,7 +242,6 @@ await ModelSendAsync(method, k.CancellationToken)
                 bool result = await k;
                 Debug.Assert(result);
 
-                // TODO cancellation token
                 await ConsumerDispatcher.WaitForShutdownAsync()
                     .ConfigureAwait(false);
             }
diff --git a/projects/RabbitMQ.Client/client/impl/Connection.Commands.cs b/projects/RabbitMQ.Client/client/impl/Connection.Commands.cs
@@ -199,16 +199,13 @@ private void MaybeStartCredentialRefresher()
             }
         }
 
-        private Task NotifyCredentialRefreshed(bool succesfully)
+        private async Task NotifyCredentialRefreshed(bool succesfully)
         {
             if (succesfully)
             {
-                return UpdateSecretAsync(_config.CredentialsProvider.Password, "Token refresh",
-                    CancellationToken.None); // TODO cancellation token
-            }
-            else
-            {
-                return Task.CompletedTask;
+                using var cts = new CancellationTokenSource(InternalConstants.DefaultConnectionCloseTimeout);
+                await UpdateSecretAsync(_config.CredentialsProvider.Password, "Token refresh", cts.Token)
+                    .ConfigureAwait(false);
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,7 @@ await ch.CloseAsync(cancellationToken)`
`286`	`286`	`try`
`287`	`287`	`{`
`288`	`288`	`_recordedEntitiesSemaphore.Release();`
`289`		`- // TODO maybe cancellation token`
	`289`	`+ // FUTURE (?) cancellation token`
`290`	`290`	`await _config.TopologyRecoveryExceptionHandler.ExchangeRecoveryExceptionHandlerAsync(recordedExchange, ex, this)`
`291`	`291`	`.ConfigureAwait(false);`
`292`	`292`	`}`
`@@ -375,7 +375,7 @@ await _recordedEntitiesSemaphore.WaitAsync(cancellationToken)`
`375`	`375`	`try`
`376`	`376`	`{`
`377`	`377`	`_recordedEntitiesSemaphore.Release();`
`378`		`- // TODO maybe cancellation token`
	`378`	`+ // FUTURE (?) cancellation token`
`379`	`379`	`await _config.TopologyRecoveryExceptionHandler.QueueRecoveryExceptionHandlerAsync(recordedQueue, ex, this)`
`380`	`380`	`.ConfigureAwait(false);`
`381`	`381`	`}`
`@@ -449,7 +449,7 @@ await ch.CloseAsync(cancellationToken)`
`449`	`449`	`try`
`450`	`450`	`{`
`451`	`451`	`_recordedEntitiesSemaphore.Release();`
`452`		`- // TODO maybe cancellation token`
	`452`	`+ // FUTURE (?) cancellation token`
`453`	`453`	`await _config.TopologyRecoveryExceptionHandler.BindingRecoveryExceptionHandlerAsync(binding, ex, this)`
`454`	`454`	`.ConfigureAwait(false);`
`455`	`455`	`}`
Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,6 @@ await ModelSendAsync(method, k.CancellationToken)`
`242`	`242`	`bool result = await k;`
`243`	`243`	`Debug.Assert(result);`
`244`	`244`
`245`		`- // TODO cancellation token`
`246`	`245`	`await ConsumerDispatcher.WaitForShutdownAsync()`
`247`	`246`	`.ConfigureAwait(false);`
`248`	`247`	`}`
Original file line number	Diff line number	Diff line change
`@@ -199,16 +199,13 @@ private void MaybeStartCredentialRefresher()`
`199`	`199`	`}`
`200`	`200`	`}`
`201`	`201`
`202`		`- private Task NotifyCredentialRefreshed(bool succesfully)`
	`202`	`+ private async Task NotifyCredentialRefreshed(bool succesfully)`
`203`	`203`	`{`
`204`	`204`	`if (succesfully)`
`205`	`205`	`{`
`206`		`- return UpdateSecretAsync(_config.CredentialsProvider.Password, "Token refresh",`
`207`		`- CancellationToken.None); // TODO cancellation token`
`208`		`- }`
`209`		`- else`
`210`		`- {`
`211`		`- return Task.CompletedTask;`
	`206`	`+ using var cts = new CancellationTokenSource(InternalConstants.DefaultConnectionCloseTimeout);`
	`207`	`+ await UpdateSecretAsync(_config.CredentialsProvider.Password, "Token refresh", cts.Token)`
	`208`	`+ .ConfigureAwait(false);`
`212`	`209`	`}`
`213`	`210`	`}`
`214`	`211`