haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

logHandle => logCallback

Browse Source
This commit is contained in:
Michael Snoyman 2012-01-31 13:38:24 +02:00
parent 26fe38a9f4
commit d349b9ecd6
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
yesod/scaffold/Application.hs.cg
View File

@ -16,7 +16,7 @@ import Yesod.Logger (Logger, logBS)
import Network.Wai.Middleware.RequestLogger (logCallbackDev) import Network.Wai.Middleware.RequestLogger (logCallbackDev)
#else #else
import Yesod.Logger (Logger, logBS, toProduction) import Yesod.Logger (Logger, logBS, toProduction)
import Network.Wai.Middleware.RequestLogger (logHandle) import Network.Wai.Middleware.RequestLogger (logCallback)
#endif #endif
import qualified Database.Persist.Store~importMigration~ import qualified Database.Persist.Store~importMigration~
import Network.HTTP.Conduit (newManager, def) import Network.HTTP.Conduit (newManager, def)
@ -50,7 +50,7 @@ getApplication conf logger = do
setLogger = logger setLogger = logger
#else #else
setLogger = toProduction logger -- by default the logger is set for development setLogger = toProduction logger -- by default the logger is set for development
logWare = logHandle (logBS setLogger) logWare = logCallback (logBS setLogger)
#endif #endif
-- for yesod devel -- for yesod devel

8
yesod/scaffold/tiny/Application.hs.cg
View File

@ -12,10 +12,10 @@ import Yesod.Default.Main (defaultDevelApp)
import Yesod.Default.Handlers (getFaviconR, getRobotsR) import Yesod.Default.Handlers (getFaviconR, getRobotsR)
#if DEVELOPMENT #if DEVELOPMENT
import Yesod.Logger (Logger, logBS) import Yesod.Logger (Logger, logBS)
import Network.Wai.Middleware.RequestLogger (logHandleDev) import Network.Wai.Middleware.RequestLogger (logCallbackDev)
#else #else
import Yesod.Logger (Logger, logBS, toProduction) import Yesod.Logger (Logger, logBS, toProduction)
import Network.Wai.Middleware.RequestLogger (logHandle) import Network.Wai.Middleware.RequestLogger (logCallback)
#endif #endif
import Network.Wai (Application) import Network.Wai (Application)
@ -39,11 +39,11 @@ getApplication conf logger = do
return $ logWare app return $ logWare app
where where
#ifdef DEVELOPMENT #ifdef DEVELOPMENT
logWare = logHandleDev (logBS setLogger) logWare = logCallbackDev (logBS setLogger)
setLogger = logger setLogger = logger
#else #else
setLogger = toProduction logger -- by default the logger is set for development setLogger = toProduction logger -- by default the logger is set for development
logWare = logHandle (logBS setLogger) logWare = logCallback (logBS setLogger)
#endif #endif
-- for yesod devel -- for yesod devel