From 288f3b36eb78ad6c55e0511b2d499bab24af1afb Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 9 Jul 2012 14:14:45 +0300 Subject: [PATCH] fast-logger/monad-logger 0.2 --- yesod-core/Yesod/Internal/Core.hs | 12 ++++++------ yesod-core/yesod-core.cabal | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/yesod-core/Yesod/Internal/Core.hs b/yesod-core/Yesod/Internal/Core.hs index 2335dca2..2ae32d5c 100644 --- a/yesod-core/Yesod/Internal/Core.hs +++ b/yesod-core/Yesod/Internal/Core.hs @@ -86,9 +86,9 @@ 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 (Logger, mkLogger, loggerDateRef, LogStr (..), loggerPutStr) +import System.Log.FastLogger (Logger, mkLogger, loggerDate, LogStr (..), loggerPutStr) import Control.Monad.Logger (LogLevel (LevelInfo, LevelOther)) -import System.Log.FastLogger.Date (getDate, DateRef) +import System.Log.FastLogger.Date (ZonedDate) import System.IO (stdout) yesodVersion :: String @@ -304,7 +304,7 @@ $doctype 5 messageLogger a logger loc level msg = if level < logLevel a then return () - else formatLogMessage (loggerDateRef logger) loc level msg >>= loggerPutStr logger + else formatLogMessage (loggerDate logger) loc level msg >>= loggerPutStr logger -- | The logging level in place for this application. Any messages below -- this level will simply be ignored. @@ -343,13 +343,13 @@ $doctype 5 | size > 50000 = FileUploadDisk tempFileSink | otherwise = FileUploadMemory lbsSink -formatLogMessage :: DateRef +formatLogMessage :: IO ZonedDate -> Loc -> LogLevel -> LogStr -- ^ message -> IO [LogStr] -formatLogMessage dateref loc level msg = do - now <- getDate dateref +formatLogMessage getdate loc level msg = do + now <- getdate return [ LB now , LB " [" diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal index c19b3333..ffd641a0 100644 --- a/yesod-core/yesod-core.cabal +++ b/yesod-core/yesod-core.cabal @@ -77,8 +77,8 @@ library , directory >= 1 && < 1.2 , vector >= 0.9 && < 0.10 , aeson >= 0.5 - , fast-logger >= 0.1 && < 0.2 - , monad-logger >= 0.0 && < 0.1 + , fast-logger >= 0.2 && < 0.3 + , monad-logger >= 0.2 && < 0.3 , conduit >= 0.5 && < 0.6 , resourcet >= 0.3 && < 0.4 , lifted-base >= 0.1 && < 0.2