Do not leak asyncs in case of AsyncExceptions

IntersectMBO · Apr 9, 2020 · e320a28 · e320a28
1 parent f1bd2e7
commit e320a28
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/ouroboros-network-framework/src/Ouroboros/Network/Subscription/Dns.hs b/ouroboros-network-framework/src/Ouroboros/Network/Subscription/Dns.hs
@@ -113,13 +113,11 @@ dnsResolve tracer getSeed withResolver peerStatesVar beforeConnect (DnsSubscript
         -- on Windows reliably so as a workaround we add an extra layer
         -- of timeout on the outside.
         -- TODO: Fix upstream dns lib.
-        --       On windows the aid_ipv6 and aid_ipv4 threads are leaked incase
-        --       of an exception in the main thread.
-        res <- timeout 20 $ do
-                 aid_ipv6 <- async $ resolveAAAA resolver gotIpv6Rsp ipv6Rsps
-                 aid_ipv4 <- async $ resolveA resolver gotIpv6Rsp ipv4Rsps
-                 rd_e <- waitEitherCatch aid_ipv6 aid_ipv4
-                 handleResult ipv6Rsps ipv4Rsps rd_e
+        res <- timeout 20 $
+          withAsync (resolveAAAA resolver gotIpv6Rsp ipv6Rsps) $ \aid_ipv6 ->
+            withAsync (resolveA resolver gotIpv6Rsp ipv4Rsps) $ \aid_ipv4 -> do
+              rd_e <- waitEitherCatch aid_ipv6 aid_ipv4
+              handleResult ipv6Rsps ipv4Rsps rd_e
         case res of
           Nothing -> do
             -- TODO: the thread timedout, we should trace it