From d349b9ecd6457f1e557b885651c3e256b4e760c6 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 31 Jan 2012 13:38:24 +0200 Subject: [PATCH] logHandle => logCallback --- yesod/scaffold/Application.hs.cg | 4 ++-- yesod/scaffold/tiny/Application.hs.cg | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/yesod/scaffold/Application.hs.cg b/yesod/scaffold/Application.hs.cg index 0de3dcfa..fe326b94 100644 --- a/yesod/scaffold/Application.hs.cg +++ b/yesod/scaffold/Application.hs.cg @@ -16,7 +16,7 @@ import Yesod.Logger (Logger, logBS) import Network.Wai.Middleware.RequestLogger (logCallbackDev) #else import Yesod.Logger (Logger, logBS, toProduction) -import Network.Wai.Middleware.RequestLogger (logHandle) +import Network.Wai.Middleware.RequestLogger (logCallback) #endif import qualified Database.Persist.Store~importMigration~ import Network.HTTP.Conduit (newManager, def) @@ -50,7 +50,7 @@ getApplication conf logger = do setLogger = logger #else setLogger = toProduction logger -- by default the logger is set for development - logWare = logHandle (logBS setLogger) + logWare = logCallback (logBS setLogger) #endif -- for yesod devel diff --git a/yesod/scaffold/tiny/Application.hs.cg b/yesod/scaffold/tiny/Application.hs.cg index e8e4dcc9..0112ac03 100644 --- a/yesod/scaffold/tiny/Application.hs.cg +++ b/yesod/scaffold/tiny/Application.hs.cg @@ -12,10 +12,10 @@ import Yesod.Default.Main (defaultDevelApp) import Yesod.Default.Handlers (getFaviconR, getRobotsR) #if DEVELOPMENT import Yesod.Logger (Logger, logBS) -import Network.Wai.Middleware.RequestLogger (logHandleDev) +import Network.Wai.Middleware.RequestLogger (logCallbackDev) #else import Yesod.Logger (Logger, logBS, toProduction) -import Network.Wai.Middleware.RequestLogger (logHandle) +import Network.Wai.Middleware.RequestLogger (logCallback) #endif import Network.Wai (Application) @@ -39,11 +39,11 @@ getApplication conf logger = do return $ logWare app where #ifdef DEVELOPMENT - logWare = logHandleDev (logBS setLogger) + logWare = logCallbackDev (logBS setLogger) setLogger = logger #else setLogger = toProduction logger -- by default the logger is set for development - logWare = logHandle (logBS setLogger) + logWare = logCallback (logBS setLogger) #endif -- for yesod devel