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

Merge pull request #242 from chreekat/master

Browse Source 
Some scaffolding cleanup
This commit is contained in:
Michael Snoyman 2012-01-27 05:22:59 -08:00
commit 6f1ab6db85
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,7 +13,7 @@ import Yesod.Default.Main
import Yesod.Default.Handlers import Yesod.Default.Handlers
#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 (logHandle)
@ -46,7 +46,7 @@ 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

2
yesod/scaffold/project.cabal.cg
View File

@ -93,7 +93,7 @@ executable ~project~
, shakespeare-text >= 0.10 && < 0.11 , shakespeare-text >= 0.10 && < 0.11
, hjsmin >= 0.0.14 && < 0.1 , hjsmin >= 0.0.14 && < 0.1
, monad-control >= 0.3 && < 0.4 , monad-control >= 0.3 && < 0.4
, wai-extra >= 1.0 && < 1.1 , wai-extra >= 1.0 && < 1.2
, yaml >= 0.5 && < 0.6 , yaml >= 0.5 && < 0.6
, http-conduit >= 1.2 && < 1.3 , http-conduit >= 1.2 && < 1.3

2
yesod/scaffold/tiny/project.cabal.cg
View File

@ -76,7 +76,7 @@ executable ~project~
, hamlet >= 0.10 && < 0.11 , hamlet >= 0.10 && < 0.11
, shakespeare-text >= 0.10 && < 0.11 , shakespeare-text >= 0.10 && < 0.11
, wai >= 1.0 && < 1.1 , wai >= 1.0 && < 1.1
, wai-extra >= 1.0 && < 1.1 , wai-extra >= 1.0 && < 1.2
, transformers >= 0.2 && < 0.3 , transformers >= 0.2 && < 0.3
, monad-control >= 0.3 && < 0.4 , monad-control >= 0.3 && < 0.4
, yaml >= 0.5 && < 0.6 , yaml >= 0.5 && < 0.6