diff --git a/src/System/Logger/Message.hs b/src/System/Logger/Message.hs index 7de1bfb729adca1d1232e2b0a769427c5fd9c307..544adc4f5c6d866337d88c2a062026a7be16ef00 100644 --- a/src/System/Logger/Message.hs +++ b/src/System/Logger/Message.hs @@ -9,6 +9,7 @@ module System.Logger.Message , Msg , msg , field + , (=:) , render ) where @@ -26,10 +27,12 @@ newtype Msg = Msg { builders :: [B.Builder] } msg :: ByteString -> Builder msg p (Msg m) = Msg (B.byteString p : m) -field :: ByteString -> ByteString -> Builder +field, (=:) :: ByteString -> ByteString -> Builder field k v (Msg m) = Msg $ B.byteString k <> B.byteString "=" <> B.byteString v : m +(=:) = field + render :: ByteString -> Builder -> L.ByteString render s f = finish . mconcat diff --git a/src/System/LoggerT.hs b/src/System/LoggerT.hs index f781526e9de9029aafc9df4aa03d0b30e4b202d5..db311a5c0f4d40adf48eef3a0d49fdd8e3242d33 100644 --- a/src/System/LoggerT.hs +++ b/src/System/LoggerT.hs @@ -27,6 +27,7 @@ where import Prelude hiding (log) import Control.Applicative +import Control.Monad.Catch import Control.Monad.Reader import System.Logger (Logger, Level (..)) import System.Logger.Message as M @@ -39,6 +40,7 @@ newtype LoggerT m a = LoggerT , Applicative , Monad , MonadIO + , MonadCatch , MonadReader Logger , MonadTrans ) diff --git a/tinylog.cabal b/tinylog.cabal index 53137b846e0ef4794dbfc60a4d35e28f89ce45ad..7182ccc7ded156920ac69d3ef08dd104614840d3 100644 --- a/tinylog.cabal +++ b/tinylog.cabal @@ -1,5 +1,5 @@ name: tinylog -version: 0.4.2 +version: 0.5 synopsis: Simplistic logging using fast-logger. author: Toralf Wittner maintainer: Toralf Wittner @@ -32,6 +32,7 @@ library base == 4.* , bytestring >= 0.10 , date-cache >= 0.3 + , exceptions >= 0.3 , fast-logger >= 2.1.4 && < 2.2 , mtl >= 2.1 , transformers >= 0.3