Merge pull request #904 from danielmarbach/rename-processing-concurre…

…ncy-backport Rename processing concurrency backport
rabbitmq · Jul 8, 2020 · 787deac · 787deac
2 parents 91e2cab + 13975a0
commit 787deac
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/projects/RabbitMQ.Client/client/api/ConnectionFactory.cs b/projects/RabbitMQ.Client/client/api/ConnectionFactory.cs
@@ -183,7 +183,7 @@ public sealed class ConnectionFactory : ConnectionFactoryBase, IAsyncConnectionF
         /// </summary>
         /// <remarks>For concurrency greater than one this removes the guarantee that consumers handle messages in the order they receive them.
         /// In addition to that consumers need to be thread/concurrency safe.</remarks>
-        public int ProcessingConcurrency { get; set; } = 1;
+        public int ConsumerDispatchConcurrency { get; set; } = 1;
 
         /// <summary>The host to connect to.</summary>
         public string HostName { get; set; } = "localhost";

diff --git a/projects/RabbitMQ.Client/client/impl/Connection.cs b/projects/RabbitMQ.Client/client/impl/Connection.cs
@@ -110,14 +110,14 @@ public Connection(IConnectionFactory factory, bool insist, IFrameHandler frameHa
             _factory = factory;
             _frameHandler = frameHandler;
 
-            int processingConcurrency = (factory as ConnectionFactory)?.ProcessingConcurrency ?? 1;
+            int consumerDispatchConcurrency = (factory as ConnectionFactory)?.ConsumerDispatchConcurrency ?? 1;
             if (factory is IAsyncConnectionFactory asyncConnectionFactory && asyncConnectionFactory.DispatchConsumersAsync)
             {
-                ConsumerWorkService = new AsyncConsumerWorkService(processingConcurrency);
+                ConsumerWorkService = new AsyncConsumerWorkService(consumerDispatchConcurrency);
             }
             else
             {
-                ConsumerWorkService = new ConsumerWorkService(processingConcurrency);
+                ConsumerWorkService = new ConsumerWorkService(consumerDispatchConcurrency);
             }
 
             _sessionManager = new SessionManager(this, 0);

diff --git a/projects/Unit/APIApproval.Approve.verified.txt b/projects/Unit/APIApproval.Approve.verified.txt
@@ -82,6 +82,7 @@ namespace RabbitMQ.Client
         public bool AutomaticRecoveryEnabled { get; set; }
         public System.Collections.Generic.IDictionary<string, object> ClientProperties { get; set; }
         public string ClientProvidedName { get; set; }
+        public int ConsumerDispatchConcurrency { get; set; }
         public System.TimeSpan ContinuationTimeout { get; set; }
         public bool DispatchConsumersAsync { get; set; }
         public RabbitMQ.Client.AmqpTcpEndpoint Endpoint { get; set; }
@@ -91,7 +92,6 @@ namespace RabbitMQ.Client
         public System.TimeSpan NetworkRecoveryInterval { get; set; }
         public string Password { get; set; }
         public int Port { get; set; }
-        public int ProcessingConcurrency { get; set; }
         public ushort RequestedChannelMax { get; set; }
         public System.TimeSpan RequestedConnectionTimeout { get; set; }
         public uint RequestedFrameMax { get; set; }

diff --git a/projects/Unit/TestAsyncConsumer.cs b/projects/Unit/TestAsyncConsumer.cs
@@ -85,7 +85,7 @@ public void TestBasicRoundtrip()
         [Test]
         public async Task TestBasicRoundtripConcurrent()
         {
-            var cf = new ConnectionFactory{ DispatchConsumersAsync = true, ProcessingConcurrency = 2 };
+            var cf = new ConnectionFactory{ DispatchConsumersAsync = true, ConsumerDispatchConcurrency = 2 };
             using(IConnection c = cf.CreateConnection())
             using(IModel m = c.CreateModel())
             {

diff --git a/projects/Unit/TestConsumer.cs b/projects/Unit/TestConsumer.cs
@@ -13,7 +13,7 @@ public class TestConsumer
         [Test]
         public async Task TestBasicRoundtripConcurrent()
         {
-            var cf = new ConnectionFactory{ ProcessingConcurrency = 2 };
+            var cf = new ConnectionFactory{ ConsumerDispatchConcurrency = 2 };
             using(IConnection c = cf.CreateConnection())
             using(IModel m = c.CreateModel())
             {