1 files changed, 7 insertions, 3 deletions

diff --git a/src/Network/BitTorrent/DHT/Search.hs b/src/Network/BitTorrent/DHT/Search.hs
index 54547211..16a20620 100644
--- a/src/Network/BitTorrent/DHT/Search.hs
+++ b/src/Network/BitTorrent/DHT/Search.hs
@@ -6,7 +6,7 @@
 {-# LANGUAGE LambdaCase #-}
 module Network.BitTorrent.DHT.Search where
 
-import Control.Concurrent.Async.Pool
+import Tasks
 import Control.Concurrent.STM
 import Control.Exception
 import Control.Monad
@@ -175,7 +175,7 @@ search sch buckets target result = do
 
 searchLoop sch@Search{..} target result s@SearchState{..} = do
     myThreadId >>= flip labelThread ("search."++show target)
-    withTaskGroup searchAlpha $ \g -> fix $ \again -> do
+    withTaskGroup ("search.g."++show target) searchAlpha $ \g -> fix $ \again -> do
         join $ atomically $ do
             cnt <- readTVar $ searchPendingCount
             informants <- readTVar searchInformant
@@ -194,7 +194,11 @@ searchLoop sch@Search{..} target result s@SearchState{..} = do
                      do writeTVar searchQueued q
                         modifyTVar searchVisited $ Set.insert (searchNodeAddress ni)
                         modifyTVar searchPendingCount succ
-                        return $ withAsync g (sendQuery sch target result s (ni :-> d)) (const again)
+                        return $ do
+                            forkTask g
+                                     "searchQuery"
+                                     $ sendQuery sch target result s (ni :-> d)
+                            again
                 _ -> -- Otherwise, we are finished.
                      do check (cnt == 0)
                         return $ return ()