diff --git a/yesod-core/Yesod/Core.hs b/yesod-core/Yesod/Core.hs index 8beedc72..661d8ec6 100644 --- a/yesod-core/Yesod/Core.hs +++ b/yesod-core/Yesod/Core.hs @@ -57,7 +57,7 @@ import Yesod.Request import Yesod.Widget import Yesod.Message -import System.Log.FastLogger +import Control.Monad.Logger -- | Return an 'Unauthorized' value, with the given i18n message. unauthorizedI :: RenderMessage master msg => msg -> GHandler sub master AuthResult diff --git a/yesod-core/Yesod/Handler.hs b/yesod-core/Yesod/Handler.hs index b519dfae..04688af4 100644 --- a/yesod-core/Yesod/Handler.hs +++ b/yesod-core/Yesod/Handler.hs @@ -165,6 +165,7 @@ import Text.Blaze.Html (toHtml, preEscapedToMarkup) #define preEscapedText preEscapedToMarkup import System.Log.FastLogger +import Control.Monad.Logger import qualified Yesod.Internal.Cache as Cache import Yesod.Internal.Cache (mkCacheKey, CacheKey) @@ -957,7 +958,7 @@ instance MonadResource (GHandler sub master) where release = lift . release resourceMask = lift . resourceMask -instance MonadLogging (GHandler sub master) where - monadLoggingLog a b c = do +instance MonadLogger (GHandler sub master) where + monadLoggerLog a b c = do hd <- ask liftIO $ handlerLog hd a b (toLogStr c) diff --git a/yesod-core/Yesod/Internal/Core.hs b/yesod-core/Yesod/Internal/Core.hs index 11791592..2335dca2 100644 --- a/yesod-core/Yesod/Internal/Core.hs +++ b/yesod-core/Yesod/Internal/Core.hs @@ -86,7 +86,8 @@ import Network.Wai.Middleware.Gzip (GzipSettings, def) import Network.Wai.Parse (tempFileSink, lbsSink) import qualified Paths_yesod_core import Data.Version (showVersion) -import System.Log.FastLogger (LogLevel (LevelInfo), Logger, mkLogger, loggerDateRef, LogStr (..), loggerPutStr) +import System.Log.FastLogger (Logger, mkLogger, loggerDateRef, LogStr (..), loggerPutStr) +import Control.Monad.Logger (LogLevel (LevelInfo, LevelOther)) import System.Log.FastLogger.Date (getDate, DateRef) import System.IO (stdout) @@ -352,7 +353,10 @@ formatLogMessage dateref loc level msg = do return [ LB now , LB " [" - , LS $ drop 5 $ show level + , LS $ + case level of + LevelOther t -> T.unpack t + _ -> drop 5 $ show level , LB "] " , msg , LB " @(" diff --git a/yesod-core/Yesod/Widget.hs b/yesod-core/Yesod/Widget.hs index 9c3cb69e..e6a27cc3 100644 --- a/yesod-core/Yesod/Widget.hs +++ b/yesod-core/Yesod/Widget.hs @@ -87,7 +87,7 @@ import Control.Monad.Base (MonadBase (liftBase)) import Control.Arrow (first) import Control.Monad.Trans.Resource -import System.Log.FastLogger +import Control.Monad.Logger preEscapedLazyText :: TL.Text -> Html preEscapedLazyText = preEscapedToMarkup @@ -345,5 +345,5 @@ instance MonadResource (GWidget sub master) where release = lift . release resourceMask = lift . resourceMask -instance MonadLogging (GWidget sub master) where - monadLoggingLog a b = lift . monadLoggingLog a b +instance MonadLogger (GWidget sub master) where + monadLoggerLog a b = lift . monadLoggerLog a b diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal index 756632dc..0a8fa555 100644 --- a/yesod-core/yesod-core.cabal +++ b/yesod-core/yesod-core.cabal @@ -78,6 +78,7 @@ library , vector >= 0.9 && < 0.10 , aeson >= 0.5 , fast-logger >= 0.1 && < 0.2 + , monad-logger >= 0.0 && < 0.1 , conduit >= 0.5 && < 0.6 , resourcet >= 0.3 && < 0.4 , lifted-base >= 0.1 && < 0.2