Add setting to configure RequestedChannelMax on ConnectionFactory

Author: Socolin

Socolin.RabbitMQ.Client.Tests.Integration/CancelActiveConsumerTests.cs

@@ -105,4 +105,4 @@ public async Task CanCancelAndInterruptCurrentProcessing()
 		messageCount.Should().Be(1);
 		completed.Should().Be(false);
 	}
-}
+}

Socolin.RabbitMQ.Client.Tests.Integration/DelayedRetryTests.cs

@@ -94,4 +94,4 @@ await _serviceClient.StartListeningQueueAsync(_queueName, consumerOptions, (mess
 		actualMessages.Should().HaveCount(3);
 		(await _serviceClient.GetMessageCountInQueueAsync(_queueName)).Should().Be(0);
 	}
-}
+}

Socolin.RabbitMQ.Client/RabbitMqChannelManager.cs

@@ -19,27 +19,16 @@ public class RabbitMqChannelManager(
 	string connectionName,
 	TimeSpan connectionTimeout,
 	ChannelType channelType,
-	TimeSpan requestedHeartbeat
+	TimeSpan requestedHeartbeat,
+	ushort maxChannelPoolSize
 ) : IRabbitMqChannelManager
 {
-	private const int MaxChannelPool = 90;
-
 	private readonly SemaphoreSlim _connectionLock = new(1);
 	private IConnection? _connection;
 
 	private readonly ConcurrentBag<IChannel> _availableChannelPool = new();
 	private int _usedChannelCount;
 
-	public RabbitMqChannelManager(
-		Uri uri,
-		string connectionName,
-		TimeSpan connectionTimeout,
-		ChannelType channelType
-	)
-		: this(uri, connectionName, connectionTimeout, channelType, ConnectionFactory.DefaultHeartbeat)
-	{
-	}
-
 	public async Task<ChannelContainer> AcquireChannelAsync()
 	{
 		if (_connection != null)
@@ -59,6 +48,7 @@ public async Task<ChannelContainer> AcquireChannelAsync()
 				Uri = uri,
 				AutomaticRecoveryEnabled = true,
 				RequestedHeartbeat = requestedHeartbeat,
+				RequestedChannelMax = maxChannelPoolSize,
 			};
 
 			_connection = await connectionFactory.CreateConnectionAsync(connectionName + ":" + channelType);
@@ -84,9 +74,6 @@ private async Task<ChannelContainer> GetOrCreateChannelAsync()
 			}
 		}
 
-		if (_usedChannelCount > MaxChannelPool)
-			throw new Exception("Too many channel allocated");
-
 		var channel = await _connection!.CreateChannelAsync();
 
 		Interlocked.Increment(ref _usedChannelCount);
@@ -113,4 +100,4 @@ public void Dispose()
 	{
 		ClearConnection();
 	}
-}
+}

Socolin.RabbitMQ.Client/RabbitMqConnectionManager.cs

@@ -8,7 +8,7 @@ namespace Socolin.RabbitMQ.Client;
 public enum ChannelType
 {
 	Publish,
-	Consumer
+	Consumer,
 }
 
 [PublicAPI]
@@ -18,14 +18,20 @@ public interface IRabbitMqConnectionManager : IDisposable
 	void ReleaseChannel(ChannelType channelType, IChannel channel);
 }
 
-public class RabbitMqConnectionManager(Uri uri, string connectionName, TimeSpan connectionTimeout, TimeSpan requestedHeart)
+public class RabbitMqConnectionManager(
+	Uri uri,
+	string connectionName,
+	TimeSpan connectionTimeout,
+	TimeSpan requestedHeart,
+	ushort maxChannelPerConnection = 90
+)
 	: IRabbitMqConnectionManager
 {
-	private readonly IRabbitMqChannelManager _publishChannelManager = new RabbitMqChannelManager(uri, connectionName, connectionTimeout, ChannelType.Publish, requestedHeart);
-	private readonly IRabbitMqChannelManager _consumerChannelManager = new RabbitMqChannelManager(uri, connectionName, connectionTimeout, ChannelType.Consumer, requestedHeart);
+	private readonly IRabbitMqChannelManager _publishChannelManager = new RabbitMqChannelManager(uri, connectionName, connectionTimeout, ChannelType.Publish, requestedHeart, maxChannelPerConnection);
+	private readonly IRabbitMqChannelManager _consumerChannelManager = new RabbitMqChannelManager(uri, connectionName, connectionTimeout, ChannelType.Consumer, requestedHeart, maxChannelPerConnection);
 
 	public RabbitMqConnectionManager(Uri uri, string connectionName, TimeSpan connectionTimeout)
-		: this(uri, connectionName, connectionTimeout, System.Threading.Timeout.InfiniteTimeSpan)
+		: this(uri, connectionName, connectionTimeout, System.Threading.Timeout.InfiniteTimeSpan, 90)
 	{
 	}
 
@@ -62,4 +68,4 @@ public void ReleaseChannel(ChannelType channelType, IChannel channel)
 				throw new ArgumentOutOfRangeException(nameof(channelType), channelType, null);
 		}
 	}
-}
+}