From 14002eccf29d7b71f7edff49d8c2966954963f3f Mon Sep 17 00:00:00 2001 From: Nikita Karetnikov Date: Thu, 22 Aug 2013 09:56:01 +0000 Subject: [PATCH 15/21] Replace 'TorDNSEL.Compat.Exception' with 'Control.Exception'. --- src/TorDNSEL/NetworkState/Internals.hs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/TorDNSEL/NetworkState/Internals.hs b/src/TorDNSEL/NetworkState/Internals.hs index 078aad4..d8fb4fb 100644 --- a/src/TorDNSEL/NetworkState/Internals.hs +++ b/src/TorDNSEL/NetworkState/Internals.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE PatternGuards, BangPatterns #-} +{-# LANGUAGE PatternGuards, BangPatterns, ScopedTypeVariables #-} {-# OPTIONS_GHC -fno-warn-type-defaults #-} ----------------------------------------------------------------------------- @@ -64,7 +64,7 @@ import Control.Monad.State import Control.Concurrent (threadDelay) import Control.Concurrent.Chan (newChan, readChan, writeChan) import Control.Concurrent.MVar (MVar, newMVar, readMVar, swapMVar) -import qualified TorDNSEL.Compat.Exception as E +import qualified Control.Exception as E import qualified Data.ByteString.Char8 as B import Data.ByteString.Char8 (ByteString) import Data.List (foldl') @@ -188,7 +188,8 @@ startNetworkStateManager initConf = do Just testConf | Right conn <- controller -> execStateT (initializeExitTests net (nsmcfStateDir initConf) testConf) emptyState - `E.catch` \e -> closeConnection conn >> E.throwIO e + `E.catch` \(e :: E.SomeException) -> + closeConnection conn >> E.throwIO e _ -> return emptyState swapMVar networkStateMV $! networkState initState signal -- 1.7.9.5