fast-logger/monad-logger 0.2
This commit is contained in:
parent
debbdc4aed
commit
288f3b36eb
@ -86,9 +86,9 @@ import Network.Wai.Middleware.Gzip (GzipSettings, def)
|
|||||||
import Network.Wai.Parse (tempFileSink, lbsSink)
|
import Network.Wai.Parse (tempFileSink, lbsSink)
|
||||||
import qualified Paths_yesod_core
|
import qualified Paths_yesod_core
|
||||||
import Data.Version (showVersion)
|
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 Control.Monad.Logger (LogLevel (LevelInfo, LevelOther))
|
||||||
import System.Log.FastLogger.Date (getDate, DateRef)
|
import System.Log.FastLogger.Date (ZonedDate)
|
||||||
import System.IO (stdout)
|
import System.IO (stdout)
|
||||||
|
|
||||||
yesodVersion :: String
|
yesodVersion :: String
|
||||||
@ -304,7 +304,7 @@ $doctype 5
|
|||||||
messageLogger a logger loc level msg =
|
messageLogger a logger loc level msg =
|
||||||
if level < logLevel a
|
if level < logLevel a
|
||||||
then return ()
|
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
|
-- | The logging level in place for this application. Any messages below
|
||||||
-- this level will simply be ignored.
|
-- this level will simply be ignored.
|
||||||
@ -343,13 +343,13 @@ $doctype 5
|
|||||||
| size > 50000 = FileUploadDisk tempFileSink
|
| size > 50000 = FileUploadDisk tempFileSink
|
||||||
| otherwise = FileUploadMemory lbsSink
|
| otherwise = FileUploadMemory lbsSink
|
||||||
|
|
||||||
formatLogMessage :: DateRef
|
formatLogMessage :: IO ZonedDate
|
||||||
-> Loc
|
-> Loc
|
||||||
-> LogLevel
|
-> LogLevel
|
||||||
-> LogStr -- ^ message
|
-> LogStr -- ^ message
|
||||||
-> IO [LogStr]
|
-> IO [LogStr]
|
||||||
formatLogMessage dateref loc level msg = do
|
formatLogMessage getdate loc level msg = do
|
||||||
now <- getDate dateref
|
now <- getdate
|
||||||
return
|
return
|
||||||
[ LB now
|
[ LB now
|
||||||
, LB " ["
|
, LB " ["
|
||||||
|
|||||||
@ -77,8 +77,8 @@ library
|
|||||||
, directory >= 1 && < 1.2
|
, directory >= 1 && < 1.2
|
||||||
, vector >= 0.9 && < 0.10
|
, vector >= 0.9 && < 0.10
|
||||||
, aeson >= 0.5
|
, aeson >= 0.5
|
||||||
, fast-logger >= 0.1 && < 0.2
|
, fast-logger >= 0.2 && < 0.3
|
||||||
, monad-logger >= 0.0 && < 0.1
|
, monad-logger >= 0.2 && < 0.3
|
||||||
, conduit >= 0.5 && < 0.6
|
, conduit >= 0.5 && < 0.6
|
||||||
, resourcet >= 0.3 && < 0.4
|
, resourcet >= 0.3 && < 0.4
|
||||||
, lifted-base >= 0.1 && < 0.2
|
, lifted-base >= 0.1 && < 0.2
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user