use RequestLogger - Debug is deprecated
This commit is contained in:
parent
00cf9f2953
commit
4fe8111867
@ -9,11 +9,11 @@ module Yesod.Default.Main
|
||||
|
||||
import Yesod.Core hiding (AppConfig (..))
|
||||
import Yesod.Default.Config
|
||||
import Yesod.Logger (Logger, makeDefaultLogger, logString, logLazyText, flushLogger)
|
||||
import Yesod.Logger (Logger, makeDefaultLogger, logString, logBS, flushLogger)
|
||||
import Network.Wai (Application)
|
||||
import Network.Wai.Handler.Warp
|
||||
(runSettings, defaultSettings, settingsPort, settingsHost)
|
||||
import Network.Wai.Middleware.Debug (debugHandle)
|
||||
import Network.Wai.Middleware.RequestLogger (logHandle)
|
||||
import System.Directory (doesDirectoryExist, removeDirectoryRecursive)
|
||||
import Network.Wai.Middleware.Gzip (gzip', GzipFiles (GzipCacheFolder), gzipFiles, def)
|
||||
import Network.Wai.Middleware.Autohead (autohead)
|
||||
@ -109,8 +109,7 @@ defaultDevelAppWith load withSite f = do
|
||||
logger <- makeDefaultLogger
|
||||
let p = appPort conf
|
||||
logString logger $ "Devel application launched, listening on port " ++ show p
|
||||
withSite conf logger $ \app -> f (p, debugHandle (logHandle logger) app)
|
||||
withSite conf logger $ \app -> f (p, logHandle (logToHandle logger) app)
|
||||
flushLogger logger
|
||||
|
||||
where
|
||||
logHandle logger msg = logLazyText logger msg >> flushLogger logger
|
||||
where
|
||||
logToHandle logger msg = logBS logger msg >> flushLogger logger
|
||||
|
||||
@ -51,7 +51,7 @@ import Yesod.Form
|
||||
import Yesod.Json
|
||||
import Yesod.Persist
|
||||
import Network.Wai (Application)
|
||||
import Network.Wai.Middleware.Debug
|
||||
import Network.Wai.Middleware.RequestLogger
|
||||
import Control.Monad.Trans.Class (lift)
|
||||
import Control.Monad.IO.Class (liftIO)
|
||||
#if MIN_VERSION_monad_control(0, 3, 0)
|
||||
@ -78,12 +78,12 @@ readIntegral s =
|
||||
warp :: (Yesod a, YesodDispatch a a) => Int -> a -> IO ()
|
||||
warp port a = toWaiApp a >>= run port
|
||||
|
||||
-- | Same as 'warp', but also sends a message to stderr for each request, and
|
||||
-- | Same as 'warp', but also sends a message to stdout for each request, and
|
||||
-- an \"application launched\" message as well. Can be useful for development.
|
||||
warpDebug :: (Yesod a, YesodDispatch a a) => Int -> a -> IO ()
|
||||
warpDebug port a = do
|
||||
hPutStrLn stderr $ "Application launched, listening on port " ++ show port
|
||||
toWaiApp a >>= run port . debug
|
||||
toWaiApp a >>= run port . logStdout
|
||||
|
||||
-- | Run a development server, where your code changes are automatically
|
||||
-- reloaded.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user