From a7351e18566b80470a4922d886fbc9bd132e77ee Mon Sep 17 00:00:00 2001 From: Toralf Wittner Date: Mon, 13 Jan 2014 15:43:52 +0100 Subject: [PATCH] Add =: as alias for 'field'. Also revive 'MonadCatch' instance of 'LoggerT'. --- src/System/Logger/Message.hs | 5 ++++- src/System/LoggerT.hs | 2 ++ tinylog.cabal | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/System/Logger/Message.hs b/src/System/Logger/Message.hs index 7de1bfb..544adc4 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 f781526..db311a5 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 53137b8..7182ccc 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 -- GitLab