From 64c55b340b392847eab1882b17ab01147750db11 Mon Sep 17 00:00:00 2001 From: Nikita Karetnikov Date: Thu, 22 Aug 2013 09:49:58 +0000 Subject: [PATCH 14/21] Replace 'OverlappingInstances' with 'IncoherentInstances'. --- src/TorDNSEL/Log/Internals.hsc | 2 +- src/TorDNSEL/NetworkState/Internals.hs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/TorDNSEL/Log/Internals.hsc b/src/TorDNSEL/Log/Internals.hsc index 53f5cba..44b30b7 100644 --- a/src/TorDNSEL/Log/Internals.hsc +++ b/src/TorDNSEL/Log/Internals.hsc @@ -1,5 +1,5 @@ {-# LANGUAGE ForeignFunctionInterface, TypeSynonymInstances, - OverlappingInstances, FlexibleInstances #-} + IncoherentInstances, FlexibleInstances #-} ----------------------------------------------------------------------------- -- | diff --git a/src/TorDNSEL/NetworkState/Internals.hs b/src/TorDNSEL/NetworkState/Internals.hs index 933b7eb..078aad4 100644 --- a/src/TorDNSEL/NetworkState/Internals.hs +++ b/src/TorDNSEL/NetworkState/Internals.hs @@ -483,6 +483,7 @@ startTorController net conf mbDelay = liftIO $ do log Info "Successfully initialized Tor controller connection." return (Right conn, tid) where + logTorControlErrors :: MonadIO m => String -> [TorControlError] -> m () logTorControlErrors event = mapM_ (log Warn "Error in " event " event: ") logParseErrors (xs,errors) = mapM_ (log Warn) errors >> return xs updateDescriptors (NetworkStateManager send _) = send . NewDescriptors -- 1.7.9.5