Pass through reason only

Author: danielmarbach

projects/RabbitMQ.Client/IChannel.cs

@@ -262,10 +262,8 @@ Task CloseAsync(ushort replyCode, string replyText, bool abort,
         /// </summary>
         /// <param name="reason">The <see cref="ShutdownEventArgs"/> instance containing the close data.</param>
         /// <param name="abort">Whether or not the close is an abort (ignoring certain exceptions).</param>
-        /// <param name="cancellationToken">CancellationToken for this operation.</param>
         /// <returns></returns>
-        Task CloseAsync(ShutdownEventArgs reason, bool abort,
-            CancellationToken cancellationToken = default);
+        Task CloseAsync(ShutdownEventArgs reason, bool abort);
 
         /// <summary>Asynchronously declare an exchange.</summary>
         /// <param name="exchange">The name of the exchange.</param>

projects/RabbitMQ.Client/Impl/AutorecoveringChannel.cs

@@ -234,13 +234,12 @@ await _connection.DeleteRecordedChannelAsync(this,
             }
         }
 
-        public async Task CloseAsync(ShutdownEventArgs args, bool abort,
-            CancellationToken cancellationToken)
+        public async Task CloseAsync(ShutdownEventArgs args, bool abort)
         {
             ThrowIfDisposed();
             try
             {
-                await _innerChannel.CloseAsync(args, abort, cancellationToken)
+                await _innerChannel.CloseAsync(args, abort)
                     .ConfigureAwait(false);
             }
             finally

projects/RabbitMQ.Client/Impl/Channel.cs

@@ -202,12 +202,12 @@ public Task CloseAsync(ushort replyCode, string replyText, bool abort,
             CancellationToken cancellationToken)
         {
             var args = new ShutdownEventArgs(ShutdownInitiator.Application, replyCode, replyText, cancellationToken: cancellationToken);
-            return CloseAsync(args, abort, cancellationToken);
+            return CloseAsync(args, abort);
         }
 
-        public async Task CloseAsync(ShutdownEventArgs args, bool abort,
-            CancellationToken cancellationToken)
+        public async Task CloseAsync(ShutdownEventArgs args, bool abort)
         {
+            CancellationToken cancellationToken = args.CancellationToken;
             CancellationToken argCancellationToken = cancellationToken;
             if (IsOpen)
             {
@@ -862,7 +862,7 @@ protected async Task<bool> HandleConnectionCloseAsync(IncomingCommand cmd, Cance
                 await ModelSendAsync(in replyMethod, cancellationToken)
                     .ConfigureAwait(false);
 
-                await Session.Connection.ClosedViaPeerAsync(reason, cancellationToken)
+                await Session.Connection.ClosedViaPeerAsync(reason)
                     .ConfigureAwait(false);
 
                 SetCloseReason(Session.Connection.CloseReason!);
@@ -897,8 +897,7 @@ protected async Task<bool> HandleConnectionStartAsync(IncomingCommand cmd, Cance
             {
                 var reason = new ShutdownEventArgs(ShutdownInitiator.Library, Constants.CommandInvalid, "Unexpected Connection.Start", cancellationToken: cancellationToken);
                 await Session.Connection.CloseAsync(reason, false,
-                    InternalConstants.DefaultConnectionCloseTimeout,
-                    cancellationToken)
+                    InternalConstants.DefaultConnectionCloseTimeout)
                     .ConfigureAwait(false);
             }
             else

projects/RabbitMQ.Client/Impl/Connection.cs

@@ -256,8 +256,7 @@ await _channel0.ConnectionOpenAsync(_config.VirtualHost, cancellationToken)
                 {
                     var ea = new ShutdownEventArgs(ShutdownInitiator.Library, Constants.InternalError, "FailedOpen", cancellationToken: cancellationToken);
                     await CloseAsync(ea, true,
-                        InternalConstants.DefaultConnectionAbortTimeout,
-                        cancellationToken).ConfigureAwait(false);
+                        InternalConstants.DefaultConnectionAbortTimeout).ConfigureAwait(false);
                 }
                 catch { }
 
@@ -300,7 +299,7 @@ public Task CloseAsync(ushort reasonCode, string reasonText, TimeSpan timeout, b
             CancellationToken cancellationToken = default)
         {
             var reason = new ShutdownEventArgs(ShutdownInitiator.Application, reasonCode, reasonText, cancellationToken: cancellationToken);
-            return CloseAsync(reason, abort, timeout, cancellationToken);
+            return CloseAsync(reason, abort, timeout);
         }
 
         ///<summary>Asychronously try to close connection in a graceful way</summary>
@@ -318,8 +317,9 @@ public Task CloseAsync(ushort reasonCode, string reasonText, TimeSpan timeout, b
         ///to complete.
         ///</para>
         ///</remarks>
-        internal async Task CloseAsync(ShutdownEventArgs reason, bool abort, TimeSpan timeout, CancellationToken cancellationToken)
+        internal async Task CloseAsync(ShutdownEventArgs reason, bool abort, TimeSpan timeout)
         {
+            CancellationToken cancellationToken = reason.CancellationToken;
             CancellationToken argCancellationToken = cancellationToken;
 
             if (abort && timeout < InternalConstants.DefaultConnectionAbortTimeout)
@@ -435,8 +435,9 @@ await _frameHandler.CloseAsync(cts.Token)
             argCancellationToken.ThrowIfCancellationRequested();
         }
 
-        internal async Task ClosedViaPeerAsync(ShutdownEventArgs reason, CancellationToken cancellationToken)
+        internal async Task ClosedViaPeerAsync(ShutdownEventArgs reason)
         {
+            CancellationToken cancellationToken = reason.CancellationToken;
             if (false == SetCloseReason(reason))
             {
                 if (_closed)

projects/RabbitMQ.Client/PublicAPI.Shipped.txt

@@ -876,7 +876,7 @@ RabbitMQ.Client.Exceptions.AlreadyClosedException.AlreadyClosedException(RabbitM
 RabbitMQ.Client.Exceptions.OperationInterruptedException.ShutdownReason.get -> RabbitMQ.Client.Events.ShutdownEventArgs?
 RabbitMQ.Client.IAsyncBasicConsumer.HandleChannelShutdownAsync(object! channel, RabbitMQ.Client.Events.ShutdownEventArgs! reason) -> System.Threading.Tasks.Task!
 RabbitMQ.Client.IChannel.ChannelShutdownAsync -> RabbitMQ.Client.Events.AsyncEventHandler<RabbitMQ.Client.Events.ShutdownEventArgs!>!
-RabbitMQ.Client.IChannel.CloseAsync(RabbitMQ.Client.Events.ShutdownEventArgs! reason, bool abort, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
+RabbitMQ.Client.IChannel.CloseAsync(RabbitMQ.Client.Events.ShutdownEventArgs! reason, bool abort) -> System.Threading.Tasks.Task!
 RabbitMQ.Client.IChannel.CloseReason.get -> RabbitMQ.Client.Events.ShutdownEventArgs?
 RabbitMQ.Client.IConnection.CloseReason.get -> RabbitMQ.Client.Events.ShutdownEventArgs?
 RabbitMQ.Client.IConnection.ConnectionShutdownAsync -> RabbitMQ.Client.Events.AsyncEventHandler<RabbitMQ.Client.Events.ShutdownEventArgs!>!

projects/Test/Integration/TestAsyncConsumer.cs

@@ -514,7 +514,7 @@ await _channel.BasicConsumeAsync(queue: queueName, autoAck: false,
             Assert.True(await publishSyncSource.Task);
             Assert.Equal(messageCount, messagesReceived);
             await _channel.QueueDeleteAsync(queue: queueName);
-            await _channel.CloseAsync(_closeArgs, false, CancellationToken.None);
+            await _channel.CloseAsync(_closeArgs, false);
         }
 
         [Fact]
@@ -591,7 +591,7 @@ await _channel.BasicConsumeAsync(queue: queueName, autoAck: false,
                 Assert.Equal((uint)0, consumerCount);
             }
 
-            await _channel.CloseAsync(_closeArgs, false, CancellationToken.None);
+            await _channel.CloseAsync(_closeArgs, false);
         }
 
         [Fact]