master..b4dc492 · typeable/control-logger

control-logger.cabal+2−2

since splitsnapshots

unifiedsplit

@@ -19,13 +19,13 @@ library

19 exposed-modules: Control.Logger.Internal

20 build-depends:

21 , aeson

22− , base >=4.11

22+ , base

23 , bytestring

24 , control-has

25 , control-has-katip

26 , deepseq

27 , exceptions

28− , fast-logger >=2.4.11

28+ , fast-logger

29 , http-client

30 , lens

31 , monad-logger

src/Control/Logger.hs+5−2

@@ -44,9 +44,7 @@ import Control.Has

44import Control.Lens hiding (censoring)

45import Control.Logger.Internal

46import Control.Logger.Orphans ()

47−import Control.Monad

48import Control.Monad.Catch

47import Control.Monad.Catch

49−import Control.Monad.IO.Class

50import qualified Data.List as List

48import qualified Data.List as List

51import Data.Monoid

49import Data.Monoid

52import Data.Text (Text)

50import Data.Text (Text)

@@ -56,6 +54,11 @@ import GHC.Stack

56import Katip (ToObject (..))

54import Katip (ToObject (..))

57import System.Log.FastLogger

55import System.Log.FastLogger

58import Text.Shakespeare.Text (st)

56import Text.Shakespeare.Text (st)

57+-- import Control.Monad.RWS (censor)

58+#if MIN_VERSION_mtl(2,3,0)

59+import Control.Monad

60+import Control.Monad.IO.Class

61+#endif

59

62

60logError

63logError

61 :: (LoggingMonad r m)

64 :: (LoggingMonad r m)

src/Control/Logger/Internal.hs+3−1

@@ -16,12 +16,14 @@ module Control.Logger.Internal

16

17import Control.Has

18import Control.Lens

19−import Control.Monad.IO.Class

20import Control.DeepSeq

19import Control.DeepSeq

21import Data.Aeson (ToJSON, FromJSON, Object, Value(..))

20import Data.Aeson (ToJSON, FromJSON, Object, Value(..))

22import Data.Text (Text)

21import Data.Text (Text)

23import Data.Monoid

22import Data.Monoid

24import GHC.Stack

23import GHC.Stack

24+#if MIN_VERSION_mtl(2,3,0)

25+import Control.Monad.IO.Class

26+#endif

25

27

26

28

27data LogSeverity

29data LogSeverity

src/Control/Logger/Orphans.hs+2−2

@@ -10,7 +10,7 @@ import Control.EnvT

10import Control.Has

11import Control.Logger.Internal

12import Control.Monad.Logger

13−import qualified Data.Text.Encoding as T

13+import qualified Data.Text as T

14import GHC.Stack

15

16

@@ -21,7 +21,7 @@ instance (Has Logger r, MonadIO m)

21 in withFrozenCallStack

22 $ logMsg

23 (mlLevelToLogSeverity level)

24− (T.decodeUtf8Lenient . fromLogStr . toLogStr $ msg)

24+ (T.pack . show . toLogStr $ msg)

25

26locToCallStack :: Loc -> CallStack

27locToCallStack Loc {..} = fromCallSiteList