fix: SocketException should not stop the server

josephnhtam · Mar 10, 2024 · a626de0 · a626de0
1 parent 13366c2
commit a626de0
Showing 1 changed file with 18 additions and 18 deletions.
diff --git a/src/LiveStreamingServerNet.Networking/Server.cs b/src/LiveStreamingServerNet.Networking/Server.cs
@@ -107,26 +107,26 @@ private async Task RunServerLoopAsync(TcpListener tcpListener, ServerEndPoint se
         {
             var cancellationToken = cts.Token;
 
-            try
+            while (!cancellationToken.IsCancellationRequested)
             {
-                while (!cancellationToken.IsCancellationRequested)
+                try
+                {
                     await AcceptClientAsync(tcpListener, serverEndPoint, cancellationToken);
-            }
-            catch (OperationCanceledException) when (cancellationToken.IsCancellationRequested)
-            {
-                throw;
-            }
-            catch (SocketException ex)
-            {
-                _logger.AcceptClientError(ex);
-                cts.Cancel();
-                throw;
-            }
-            catch (Exception ex)
-            {
-                _logger.ServerLoopError(ex);
-                cts.Cancel();
-                throw;
+                }
+                catch (SocketException ex)
+                {
+                    _logger.AcceptClientError(ex);
+                }
+                catch (OperationCanceledException) when (cancellationToken.IsCancellationRequested)
+                {
+                    throw;
+                }
+                catch (Exception ex)
+                {
+                    _logger.ServerLoopError(ex);
+                    cts.Cancel();
+                    throw;
+                }
             }
         }