Add finalizer for reaper thread

snoyberg · Aug 4, 2013 · 5929373 · 5929373 · nezetic · Aug 20, 2013
1 parent 45da488
commit 5929373
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/Network/HTTP/Conduit/Manager.hs b/Network/HTTP/Conduit/Manager.hs
@@ -65,6 +65,7 @@ import Network.Socks5 (SocksConf)
 import Data.Default
 import Data.Maybe (mapMaybe)
 import System.IO (Handle)
+import System.Mem.Weak (addFinalizer)
 import Data.Conduit (($$), yield, runException)
 
 -- | Settings for a @Manager@. Please use the 'def' function and then modify
@@ -185,13 +186,15 @@ newManager ms = do
     mapRef <- I.newIORef (Just Map.empty)
     certCache <- I.newIORef Map.empty
     _ <- forkIO $ reap mapRef certCache
-    return Manager
-        { mConns = mapRef
-        , mMaxConns = managerConnCount ms
-        , mCheckCerts = \x y -> getCertStore >>= \cs -> managerCheckCerts ms cs x y
-        , mCertCache = certCache
-        , mResponseTimeout = managerResponseTimeout ms
-        }
+    let manager = Manager
+            { mConns = mapRef
+            , mMaxConns = managerConnCount ms
+            , mCheckCerts = \x y -> getCertStore >>= \cs -> managerCheckCerts ms cs x y
+            , mCertCache = certCache
+            , mResponseTimeout = managerResponseTimeout ms
+            }
+    addFinalizer manager $ closeManager manager
+    return manager
 
 -- | Collect and destroy any stale connections.
 reap :: I.IORef (Maybe (Map.Map ConnKey (NonEmptyList ConnInfo)))