Adds handling exception when stopping proxy. Closes #944

microsoft · Nov 20, 2024 · 729e72b · 729e72b
1 parent 1d349a1
commit 729e72b
Showing 1 changed file with 16 additions and 9 deletions.
diff --git a/dev-proxy/ProxyEngine.cs b/dev-proxy/ProxyEngine.cs
@@ -160,19 +160,26 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
         }
         _pluginEvents.AfterRequestLog += AfterRequestLogAsync;
 
-        while (!stoppingToken.IsCancellationRequested && _proxyServer.ProxyRunning)
+
+        try
         {
-            while (!Console.KeyAvailable)
+            while (!stoppingToken.IsCancellationRequested && _proxyServer.ProxyRunning)
             {
-                await Task.Delay(10, stoppingToken);
-            }
-            // we need this check or proxy will fail with an exception
-            // when run for example in VSCode's integrated terminal
-            if (isInteractive)
-            {
-                await ReadKeysAsync();
+                while (!Console.KeyAvailable)
+                {
+                    await Task.Delay(10, stoppingToken);
+                }
+                // we need this check or proxy will fail with an exception
+                // when run for example in VSCode's integrated terminal
+                if (isInteractive)
+                {
+                    await ReadKeysAsync();
+                }
             }
         }
+        catch (TaskCanceledException)
+        {
+        }
     }
 
     private void FirstRunSetup()