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

Simplify scaffold futher by using defaultDevelApp

Browse Source
This commit is contained in:
patrick brisbin 2011-09-11 17:15:35 -04:00
parent 41f1718387
commit f06f11ff26
2 changed files with 5 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,11 +12,10 @@ import Foundation
import Settings import Settings
import Settings.StaticFiles (static) import Settings.StaticFiles (static)
import Yesod.Auth import Yesod.Auth
import Yesod.Logger (makeLogger, flushLogger, Logger, logString, logLazyText) import Yesod.Logger (Logger)
import Database.Persist.~importGenericDB~ import Database.Persist.~importGenericDB~
import Data.ByteString (ByteString) import Data.ByteString (ByteString)
import Data.Dynamic (Dynamic, toDyn) import Data.Dynamic (Dynamic, toDyn)
import Network.Wai.Middleware.Debug (debugHandle)
#ifndef WINDOWS #ifndef WINDOWS
import qualified System.Posix.Signals as Signal import qualified System.Posix.Signals as Signal
@ -63,16 +62,4 @@ with~sitearg~ conf logger f = do
-- for yesod devel -- for yesod devel
withDevelAppPort :: Dynamic withDevelAppPort :: Dynamic
withDevelAppPort = withDevelAppPort = toDyn $ defaultDevelApp with~sitearg~
toDyn go
where
go :: ((Int, Application) -> IO ()) -> IO ()
go f = do
conf <- loadConfig Development
let port = appPort conf
logger <- makeLogger
logString logger $ "Devel application launched, listening on port " ++ show port
with~sitearg~ conf logger $ \app -> f (port, debugHandle (logHandle logger) app)
flushLogger logger
where
logHandle logger msg = logLazyText logger msg >> flushLogger logger

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

@ -12,11 +12,11 @@ import Foundation
import Settings import Settings
import Yesod.Static import Yesod.Static
import Yesod.Settings import Yesod.Settings
import Yesod.Logger (makeLogger, flushLogger, Logger, logLazyText, logString) import Yesod.Main (defaultDevelApp)
import Yesod.Logger (Logger)
import Data.ByteString (ByteString) import Data.ByteString (ByteString)
import Network.Wai (Application) import Network.Wai (Application)
import Data.Dynamic (Dynamic, toDyn) import Data.Dynamic (Dynamic, toDyn)
import Network.Wai.Middleware.Debug (debugHandle)
-- Import all relevant handler modules here. -- Import all relevant handler modules here.
import Handler.Root import Handler.Root
@ -50,16 +50,4 @@ with~sitearg~ conf logger f = do
-- for yesod devel -- for yesod devel
withDevelAppPort :: Dynamic withDevelAppPort :: Dynamic
withDevelAppPort = withDevelAppPort = toDyn $ defaultDevelApp with~sitearg~
toDyn go
where
go :: ((Int, Application) -> IO ()) -> IO ()
go f = do
conf <- loadConfig Development
let port = appPort conf
logger <- makeLogger
logString logger $ "Devel application launched, listening on port " ++ show port
with~sitearg~ conf logger $ \app -> f (port, debugHandle (logHandle logger) app)
flushLogger logger
where
logHandle logger msg = logLazyText logger msg >> flushLogger logger