From f4e2b2144f2ccf79262b4715c2ebe41e9eab388d Mon Sep 17 00:00:00 2001 From: Nikita Karetnikov Date: Thu, 22 Aug 2013 10:03:53 +0000 Subject: [PATCH 16/21] Replace 'TorDNSEL.Compat.Exception' with 'Control.Exception'. --- src/TorDNSEL/Statistics/Internals.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/TorDNSEL/Statistics/Internals.hs b/src/TorDNSEL/Statistics/Internals.hs index b1b505f..10f35fc 100644 --- a/src/TorDNSEL/Statistics/Internals.hs +++ b/src/TorDNSEL/Statistics/Internals.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE BangPatterns #-} +{-# LANGUAGE BangPatterns, ScopedTypeVariables #-} {-# OPTIONS_GHC -fglasgow-exts -fno-warn-type-defaults #-} ----------------------------------------------------------------------------- @@ -23,7 +23,7 @@ import Prelude hiding (log) import Control.Concurrent.Chan (Chan, newChan, readChan, writeChan) import Control.Concurrent.MVar (MVar, newMVar, modifyMVar_, readMVar) import Control.Concurrent.QSem (QSem, newQSem, waitQSem, signalQSem) -import qualified TorDNSEL.Compat.Exception as E +import qualified Control.Exception as E import Control.Monad.Fix (fix) import qualified Data.ByteString.Char8 as B import Data.Maybe (isJust, isNothing) @@ -134,7 +134,7 @@ forkListener statsChan listenSock sem = forkLinkIO . E.block . forever $ do waitQSem sem (client,_) <- E.unblock $ accept listenSock - `E.catch` \e -> signalQSem sem >> E.throwIO e + `E.catch` \(e :: E.SomeException) -> signalQSem sem >> E.throwIO e writeChan statsChan $ NewClient client -- | Terminate the stats server gracefully. The optional parameter specifies the -- 1.7.9.5