fix unlimited connection limit

microsoft · Nov 26, 2024 · 101f19b · 101f19b
1 parent 85c88ae
commit 101f19b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/libs/server/Servers/GarnetServerOptions.cs b/libs/server/Servers/GarnetServerOptions.cs
@@ -249,7 +249,7 @@ public class GarnetServerOptions : ServerOptions
         /// <summary>
         /// Maximum client connection limit
         /// </summary>
-        public int NetworkConnectionLimit = 0;
+        public int NetworkConnectionLimit = -1;
 
         /// <summary>
         /// Creator of device factories

diff --git a/libs/server/Servers/GarnetServerTcp.cs b/libs/server/Servers/GarnetServerTcp.cs
@@ -24,7 +24,7 @@ public class GarnetServerTcp : GarnetServerBase, IServerHook
         readonly int networkSendThrottleMax;
         readonly NetworkBufferSettings networkBufferSettings;
         readonly LimitedFixedBufferPool networkPool;
-        readonly int connectionLimit;
+        readonly int networkConnectionLimit;
 
         public IPEndPoint GetEndPoint
         {
@@ -70,10 +70,10 @@ public IEnumerable<IClusterSession> ActiveClusterSessions()
         /// <param name="tlsOptions"></param>
         /// <param name="networkSendThrottleMax"></param>
         /// <param name="logger"></param>
-        public GarnetServerTcp(string address, int port, int networkBufferSize = default, IGarnetTlsOptions tlsOptions = null, int networkSendThrottleMax = 8, int connectionLimit = -1, ILogger logger = null)
+        public GarnetServerTcp(string address, int port, int networkBufferSize = default, IGarnetTlsOptions tlsOptions = null, int networkSendThrottleMax = 8, int networkConnectionLimit = -1, ILogger logger = null)
             : base(address, port, networkBufferSize, logger)
         {
-            this.connectionLimit = connectionLimit;
+            this.networkConnectionLimit = networkConnectionLimit;
             this.tlsOptions = tlsOptions;
             this.networkSendThrottleMax = networkSendThrottleMax;
             var serverBufferSize = BufferSizeUtils.ServerBufferSize(new MaxSizeSettings());
@@ -140,7 +140,7 @@ private unsafe bool HandleNewConnection(SocketAsyncEventArgs e)
             if (activeHandlerCount >= 0)
             {
                 var currentActiveHandlerCount = Interlocked.Increment(ref activeHandlerCount);
-                if (currentActiveHandlerCount > 0 && (connectionLimit == -1 || currentActiveHandlerCount <= connectionLimit))
+                if (currentActiveHandlerCount > 0 && (networkConnectionLimit == -1 || currentActiveHandlerCount <= networkConnectionLimit))
                 {
                     try
                     {