From a016bcc3a6eaf2008d5f713420e4b0c760d2718d Mon Sep 17 00:00:00 2001
From: Toralf Wittner <tw@dtex.org>
Date: Fri, 10 Jan 2014 12:19:06 +0100
Subject: [PATCH] Simplify 'LoggerT'.

---
 src/System/LoggerT.hs | 14 +++++---------
 tinylog.cabal         |  3 +--
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/System/LoggerT.hs b/src/System/LoggerT.hs
index 3c1f5b8..f781526 100644
--- a/src/System/LoggerT.hs
+++ b/src/System/LoggerT.hs
@@ -28,13 +28,10 @@ where
 import Prelude hiding (log)
 import Control.Applicative
 import Control.Monad.Reader
-import Control.Monad.Catch
-import Data.ByteString (ByteString)
 import System.Logger (Logger, Level (..))
 import System.Logger.Message as M
 
-import qualified Data.ByteString as BS
-import qualified System.Logger   as L
+import qualified System.Logger as L
 
 newtype LoggerT m a = LoggerT
     { unwrap :: ReaderT Logger m a
@@ -42,7 +39,6 @@ newtype LoggerT m a = LoggerT
                , Applicative
                , Monad
                , MonadIO
-               , MonadCatch
                , MonadReader Logger
                , MonadTrans
                )
@@ -50,20 +46,20 @@ newtype LoggerT m a = LoggerT
 class MonadIO m => MonadLogger m where
     logger :: m Logger
 
-    prefix :: m ByteString
-    prefix = return BS.empty
+    prefix :: m Builder
+    prefix = return id
 
     log :: Level -> Builder -> m ()
     log l m = do
         g <- logger
         p <- prefix
-        L.log g l (msg' p . m)
+        L.log g l (p . m)
 
     logM :: Level -> m Builder -> m ()
     logM l m = do
         g <- logger
         p <- prefix
-        L.logM g l ((msg' p .) `liftM` m)
+        L.logM g l ((p .) `liftM` m)
 
     trace, debug, info, warn, err, fatal :: Builder -> m ()
     trace = log Trace
diff --git a/tinylog.cabal b/tinylog.cabal
index dcdd085..41e9fc5 100644
--- a/tinylog.cabal
+++ b/tinylog.cabal
@@ -1,5 +1,5 @@
 name:                 tinylog
-version:              0.3.1
+version:              0.4
 synopsis:             Simplistic logging using fast-logger.
 author:               Toralf Wittner
 maintainer:           Toralf Wittner <tw@dtex.org>
@@ -32,7 +32,6 @@ library
           base         == 4.*
         , bytestring   >= 0.10
         , date-cache   >= 0.3
-        , exceptions   >= 0.3
         , fast-logger  >= 2.1.2 && < 2.2
         , mtl          >= 2.1
         , transformers >= 0.3
-- 
GitLab