git.iko.soy/typeable/control-logger
on b4dc492 help sign in
2478ebf
swap
0 ahead, 4 behind
4 files changed+12−7
since splitsnapshots
unifiedsplit
control-logger.cabal+2−2 src/Control/Logger.hs+5−2 src/Control/Logger/Internal.hs+3−1 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 >=4.11
22+ , base
2323 , bytestring
2424 , control-has
2525 , control-has-katip
2626 , deepseq
2727 , exceptions
28− , fast-logger >=2.4.11
28+ , fast-logger
2929 , http-client
3030 , lens
3131 , monad-logger
src/Control/Logger.hs+5−2
@@ -44,9 +44,7 @@ import Control.Has
4444import Control.Lens hiding (censoring)
4545import Control.Logger.Internal
4646import Control.Logger.Orphans ()
47−import Control.Monad
4847import Control.Monad.Catch
49−import Control.Monad.IO.Class
5048import qualified Data.List as List
5149import Data.Monoid
5250import Data.Text (Text)
@@ -56,6 +54,11 @@ import GHC.Stack
5654import Katip (ToObject (..))
5755import System.Log.FastLogger
5856import 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
5962
6063logError
6164 :: (LoggingMonad r m)
src/Control/Logger/Internal.hs+3−1
@@ -16,12 +16,14 @@ module Control.Logger.Internal
1616
1717import Control.Has
1818import Control.Lens
19−import Control.Monad.IO.Class
2019import Control.DeepSeq
2120import Data.Aeson (ToJSON, FromJSON, Object, Value(..))
2221import Data.Text (Text)
2322import Data.Monoid
2423import GHC.Stack
24+#if MIN_VERSION_mtl(2,3,0)
25+import Control.Monad.IO.Class
26+#endif
2527
2628
2729data 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.Encoding as T
13+import qualified Data.Text 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.decodeUtf8Lenient . fromLogStr . toLogStr $ msg)
24+ (T.pack . show . toLogStr $ msg)
2525
2626locToCallStack :: Loc -> CallStack
2727locToCallStack Loc {..} = fromCallSiteList