* Allow cancellation of final await for publisher confirmation in BasicPublishAsync

lukebakken · lukebakken · commit bbdc58e46bf6 · 2024-10-02T16:31:05.000-07:00
* Fix `dotnet format` verification error
diff --git a/projects/RabbitMQ.Client/Impl/ChannelBase.cs b/projects/RabbitMQ.Client/Impl/ChannelBase.cs
@@ -1070,8 +1070,7 @@ await _confirmSemaphore.WaitAsync(cancellationToken)
 
             if (publisherConfirmationTcs is not null)
             {
-                // TODO timeout?
-                await publisherConfirmationTcs.Task
+                await publisherConfirmationTcs.Task.WaitAsync(cancellationToken)
                     .ConfigureAwait(false);
             }
         }
@@ -1168,8 +1167,7 @@ await _confirmSemaphore.WaitAsync(cancellationToken)
 
             if (publisherConfirmationTcs is not null)
             {
-                // TODO timeout?
-                await publisherConfirmationTcs.Task
+                await publisherConfirmationTcs.Task.WaitAsync(cancellationToken)
                     .ConfigureAwait(false);
             }
         }
diff --git a/projects/Test/Integration/TestAsyncConsumer.cs b/projects/Test/Integration/TestAsyncConsumer.cs
@@ -708,7 +708,7 @@ private async Task ValidateConsumerDispatchConcurrency()
             Assert.Equal(ConsumerDispatchConcurrency, autorecoveringChannel.ConsumerDispatcher.Concurrency);
             Assert.Equal(_consumerDispatchConcurrency, autorecoveringChannel.ConsumerDispatcher.Concurrency);
             await using IChannel ch = await _conn.CreateChannelAsync(
-                new CreateChannelOptions { ConsumerDispatchConcurrency = expectedConsumerDispatchConcurrency});
+                new CreateChannelOptions { ConsumerDispatchConcurrency = expectedConsumerDispatchConcurrency });
             AutorecoveringChannel ach = (AutorecoveringChannel)ch;
             Assert.Equal(expectedConsumerDispatchConcurrency, ach.ConsumerDispatcher.Concurrency);
         }

Original file line number	Diff line number	Diff line change
`@@ -1070,8 +1070,7 @@ await _confirmSemaphore.WaitAsync(cancellationToken)`
`1070`	`1070`
`1071`	`1071`	`if (publisherConfirmationTcs is not null)`
`1072`	`1072`	`{`
`1073`		`- // TODO timeout?`
`1074`		`- await publisherConfirmationTcs.Task`
	`1073`	`+ await publisherConfirmationTcs.Task.WaitAsync(cancellationToken)`
`1075`	`1074`	`.ConfigureAwait(false);`
`1076`	`1075`	`}`
`1077`	`1076`	`}`
`@@ -1168,8 +1167,7 @@ await _confirmSemaphore.WaitAsync(cancellationToken)`
`1168`	`1167`
`1169`	`1168`	`if (publisherConfirmationTcs is not null)`
`1170`	`1169`	`{`
`1171`		`- // TODO timeout?`
`1172`		`- await publisherConfirmationTcs.Task`
	`1170`	`+ await publisherConfirmationTcs.Task.WaitAsync(cancellationToken)`
`1173`	`1171`	`.ConfigureAwait(false);`
`1174`	`1172`	`}`
`1175`	`1173`	`}`
Original file line number	Diff line number	Diff line change
`@@ -708,7 +708,7 @@ private async Task ValidateConsumerDispatchConcurrency()`
`708`	`708`	`Assert.Equal(ConsumerDispatchConcurrency, autorecoveringChannel.ConsumerDispatcher.Concurrency);`
`709`	`709`	`Assert.Equal(_consumerDispatchConcurrency, autorecoveringChannel.ConsumerDispatcher.Concurrency);`
`710`	`710`	`await using IChannel ch = await _conn.CreateChannelAsync(`
`711`		`- new CreateChannelOptions { ConsumerDispatchConcurrency = expectedConsumerDispatchConcurrency});`
	`711`	`+ new CreateChannelOptions { ConsumerDispatchConcurrency = expectedConsumerDispatchConcurrency });`
`712`	`712`	`AutorecoveringChannel ach = (AutorecoveringChannel)ch;`
`713`	`713`	`Assert.Equal(expectedConsumerDispatchConcurrency, ach.ConsumerDispatcher.Concurrency);`
`714`	`714`	`}`