git.iko.soy/typeable/control-logger
on master help sign in
swap
2478ebf4 ahead, 0 behind
4 files changed+7−12
since splitsnapshots
unifiedsplit
control-logger.cabal+2−2 src/Control/Logger.hs+2−5 src/Control/Logger/Internal.hs+1−3 src/Control/Logger/Orphans.hs+2−2
control-logger.cabal+2−2
@@ -19,13 +19,13 @@ library
1919 exposed-modules: Control.Logger.Internal
2020 build-depends:
2121 , aeson
22− , base
22+ , base >=4.11
2323 , bytestring
2424 , control-has
2525 , control-has-katip
2626 , deepseq
2727 , exceptions
28− , fast-logger
28+ , fast-logger >=2.4.11
2929 , http-client
3030 , lens
3131 , monad-logger
src/Control/Logger.hs+2−5
@@ -44,7 +44,9 @@ import Control.Has
4444import Control.Lens hiding (censoring)
4545import Control.Logger.Internal
4646import Control.Logger.Orphans ()
47+import Control.Monad
4748import Control.Monad.Catch
49+import Control.Monad.IO.Class
4850import qualified Data.List as List
4951import Data.Monoid
5052import Data.Text (Text)
@@ -54,11 +56,6 @@ import GHC.Stack
5456import Katip (ToObject (..))
5557import System.Log.FastLogger
5658import 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
6259
6360logError
6461 :: (LoggingMonad r m)
src/Control/Logger/Internal.hs+1−3
@@ -16,14 +16,12 @@ module Control.Logger.Internal
1616
1717import Control.Has
1818import Control.Lens
19+import Control.Monad.IO.Class
1920import Control.DeepSeq
2021import Data.Aeson (ToJSON, FromJSON, Object, Value(..))
2122import Data.Text (Text)
2223import Data.Monoid
2324import GHC.Stack
24−#if MIN_VERSION_mtl(2,3,0)
25−import Control.Monad.IO.Class
26−#endif
2725
2826
2927data LogSeverity
src/Control/Logger/Orphans.hs+2−2
@@ -10,7 +10,7 @@ import Control.EnvT
1010import Control.Has
1111import Control.Logger.Internal
1212import Control.Monad.Logger
13−import qualified Data.Text as T
13+import qualified Data.Text.Encoding as T
1414import GHC.Stack
1515
1616
@@ -21,7 +21,7 @@ instance (Has Logger r, MonadIO m)
2121 in withFrozenCallStack
2222 $ logMsg
2323 (mlLevelToLogSeverity level)
24− (T.pack . show . toLogStr $ msg)
24+ (T.decodeUtf8Lenient . fromLogStr . toLogStr $ msg)
2525
2626locToCallStack :: Loc -> CallStack
2727locToCallStack Loc {..} = fromCallSiteList