Fix ShutdownInitiator in CloseAsync

lukebakken · lukebakken · commit 38527ff9a7ad · 2024-05-22T07:36:05.000-07:00
`AutorecoveringChannel` `CloseAsync` should just call `_innerChannel.CloseAsync`
diff --git a/projects/RabbitMQ.Client/client/impl/AutorecoveringChannel.cs b/projects/RabbitMQ.Client/client/impl/AutorecoveringChannel.cs
@@ -204,8 +204,7 @@ public Task CloseAsync(ushort replyCode, string replyText, bool abort,
             CancellationToken cancellationToken)
         {
             ThrowIfDisposed();
-            var args = new ShutdownEventArgs(ShutdownInitiator.Library, replyCode, replyText);
-            return CloseAsync(args, abort, cancellationToken);
+            return _innerChannel.CloseAsync(replyCode, replyText, abort, cancellationToken);
         }
 
         public async Task CloseAsync(ShutdownEventArgs args, bool abort,
diff --git a/projects/Test/Applications/MassPublish/Program.cs b/projects/Test/Applications/MassPublish/Program.cs
@@ -156,6 +156,7 @@ await publishChannel.BasicPublishAsync(exchange: ExchangeName, routingKey: Routi
             }
 
             await consumeChannel.CloseAsync();
+            await consumeConnection.CloseAsync();
         }
 
         private static void PublishChannel_BasicNacks(object sender, BasicNackEventArgs e)

Original file line number	Diff line number	Diff line change
`@@ -204,8 +204,7 @@ public Task CloseAsync(ushort replyCode, string replyText, bool abort,`
`204`	`204`	`CancellationToken cancellationToken)`
`205`	`205`	`{`
`206`	`206`	`ThrowIfDisposed();`
`207`		`- var args = new ShutdownEventArgs(ShutdownInitiator.Library, replyCode, replyText);`
`208`		`- return CloseAsync(args, abort, cancellationToken);`
	`207`	`+ return _innerChannel.CloseAsync(replyCode, replyText, abort, cancellationToken);`
`209`	`208`	`}`
`210`	`209`
`211`	`210`	`public async Task CloseAsync(ShutdownEventArgs args, bool abort,`
Original file line number	Diff line number	Diff line change
`@@ -156,6 +156,7 @@ await publishChannel.BasicPublishAsync(exchange: ExchangeName, routingKey: Routi`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`await consumeChannel.CloseAsync();`
	`159`	`+ await consumeConnection.CloseAsync();`
`159`	`160`	`}`
`160`	`161`
`161`	`162`	`private static void PublishChannel_BasicNacks(object sender, BasicNackEventArgs e)`