monad-logger 0.3.13.2 → 0.3.14

raw patch · 3 files changed

+22/−8 lines, 3 files

Files

• ChangeLog.md +4/−0
• Control/Monad/Logger.hs +17/−7
• monad-logger.cabal +1/−1

@@ -1,3 +1,7 @@+## 0.3.14++* Don't include source location for defaultLoc [#69](https://github.com/kazu-yamamoto/logger/issues/69)+ ## 0.3.13.1  * Allow fast-logger 2.3

@@ -9,6 +9,7 @@ {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE UndecidableInstances #-}+{-# LANGUAGE Trustworthy #-} -- |  This module provides the facilities needed for a decoupled logging system. -- -- The 'MonadLogger' class is implemented by monads that give access to a@@ -132,13 +133,15 @@ import Control.Monad.State.Class  ( MonadState (..) ) import Control.Monad.Writer.Class ( MonadWriter (..) ) -import Blaze.ByteString.Builder (toByteString)- import Prelude hiding (catch) -#if !MIN_VERSION_fast_logger(2, 1, 0) && MIN_VERSION_bytestring(0, 10, 2)+#if MIN_VERSION_fast_logger(2, 1, 0)+-- Using System.Log.FastLogger+#elif MIN_VERSION_bytestring(0, 10, 2) import qualified Data.ByteString.Lazy as L import Data.ByteString.Builder (toLazyByteString)+#else+import Blaze.ByteString.Builder (toByteString) #endif  #if MIN_VERSION_conduit_extra(1,1,0)@@ -515,9 +518,12 @@         else "#" `mappend` toLogStr src) `mappend`     "] " `mappend`     msg `mappend`-    " @(" `mappend`-    toLogStr (S8.pack fileLocStr) `mappend`-    ")\n"+    (if isDefaultLoc loc+        then "\n"+        else+            " @(" `mappend`+            toLogStr (S8.pack fileLocStr) `mappend`+            ")\n") #else     S8.concat         [ S8.pack "["@@ -576,7 +582,7 @@ -- -- Since 0.3.2 withChannelLogger :: (MonadBaseControl IO m, MonadIO m)-                  => Int         -- ^ Number of mesasges to keep+                  => Int         -- ^ Number of messages to keep                   -> LoggingT m a                   -> LoggingT m a withChannelLogger size action = LoggingT $ \logger -> do@@ -646,6 +652,10 @@  defaultLoc :: Loc defaultLoc = Loc "<unknown>" "<unknown>" "<unknown>" (0,0) (0,0)++isDefaultLoc :: Loc -> Bool+isDefaultLoc (Loc "<unknown>" "<unknown>" "<unknown>" (0,0) (0,0)) = True+isDefaultLoc _ = False  logWithoutLoc :: (MonadLogger m, ToLogStr msg) => LogSource -> LogLevel -> msg -> m () logWithoutLoc = monadLoggerLog defaultLoc

@@ -1,5 +1,5 @@ name:                monad-logger-version:             0.3.13.2+version:             0.3.14 synopsis:            A class of monads which can log messages. description:         Hackage documentation generation is not reliable. For up to date documentation, please see: <http://www.stackage.org/package/monad-logger>. homepage:            https://github.com/kazu-yamamoto/logger