Include level in source

This commit is contained in:
Michael Snoyman 2012-10-13 22:40:03 +02:00
parent 74cf1f77be
commit ae23dee4ab
2 changed files with 8 additions and 2 deletions

View File

@ -326,7 +326,7 @@ $doctype 5
-> IO () -> IO ()
messageLoggerSource a logger loc source level msg = messageLoggerSource a logger loc source level msg =
if shouldLog a source level if shouldLog a source level
then formatLogMessage (loggerDate logger) loc level msg >>= loggerPutStr logger then formatLogMessage (loggerDate logger) loc source level msg >>= loggerPutStr logger
else return () else return ()
-- | The logging level in place for this application. Any messages below -- | The logging level in place for this application. Any messages below
@ -376,10 +376,11 @@ $doctype 5
formatLogMessage :: IO ZonedDate formatLogMessage :: IO ZonedDate
-> Loc -> Loc
-> LogSource
-> LogLevel -> LogLevel
-> LogStr -- ^ message -> LogStr -- ^ message
-> IO [LogStr] -> IO [LogStr]
formatLogMessage getdate loc level msg = do formatLogMessage getdate loc src level msg = do
now <- getdate now <- getdate
return return
[ LB now [ LB now
@ -388,6 +389,10 @@ formatLogMessage getdate loc level msg = do
case level of case level of
LevelOther t -> T.unpack t LevelOther t -> T.unpack t
_ -> drop 5 $ show level _ -> drop 5 $ show level
, LS $
if T.null src
then ""
else "#" ++ T.unpack src
, LB "] " , LB "] "
, msg , msg
, LB " @(" , LB " @("

View File

@ -43,6 +43,7 @@ instance Yesod HelloWorld where
getRootR = do getRootR = do
$(logOther "HAHAHA") "Here I am" $(logOther "HAHAHA") "Here I am"
$logOtherS "source" "level" "message"
defaultLayout $ do defaultLayout $ do
addScriptRemote "https://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js" addScriptRemote "https://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js"
toWidget [julius|$(function(){$("#mypara").css("color", "red")});|] toWidget [julius|$(function(){$("#mypara").css("color", "red")});|]