typeable/wai
1
0
Fork 0
mirror of https://github.com/typeable/wai.git synced 2025-01-06 05:25:53 +03:00
Code Issues Projects Releases Wiki Activity

Fix devel logger behavior for consistency

Browse Source
This commit is contained in:
Michael Snoyman 2013-09-08 16:59:16 +02:00
parent 00d49d7999
commit 4f76770ff2
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
wai-extra/Network/Wai/Middleware/RequestLogger.hs
View File

@ -34,7 +34,7 @@ import qualified Data.Conduit as C
import qualified Data.Conduit.List as CL
import System.Console.ANSI
import Data.IORef
import Data.IORef.Lifted
import System.IO.Unsafe
import Data.Default (Default (def))
@ -198,7 +198,24 @@ detailedMiddleware' cb getAddColor app req = do
body <- requestBody req C.$$ CL.consume
-- logging the body here consumes it, so fill it back up
-- obviously not efficient, but this is the development logger
let req' = req { requestBody = CL.sourceList body }
--
-- Note: previously, we simply used CL.sourceList. However,
-- that meant that you could read the request body in twice.
-- While that in itself is not a problem, the issue is that,
-- in production, you wouldn't be able to do this, and
-- therefore some bugs wouldn't show up during testing. This
-- implementation ensures that each chunk is only returned
-- once.
ichunks <- newIORef body
let rbody = do
chunks <- readIORef ichunks
case chunks of
[] -> return ()
x:xs -> do
writeIORef ichunks xs
C.yield x
rbody
let req' = req { requestBody = rbody }
return (req', body)
_ -> return (req, [])

3
wai-extra/wai-extra.cabal
View File

@ -1,5 +1,5 @@
Name: wai-extra
Version: 1.3.4.4
Version: 1.3.4.5
Synopsis: Provides some basic WAI handlers and middleware.
Description: The goal here is to provide common features without many dependencies.
License: MIT
@ -46,6 +46,7 @@ Library
, containers
, base64-bytestring
, word8
, lifted-base
Exposed-modules: Network.Wai.Handler.CGI
Network.Wai.Middleware.AcceptOverride