on master help sign in
Merge pull request #604 from tstat/master

All loggers follow the autoFlush setting

commitbbab0fa2f5c251b3b8c40611f1643fcaa49fe7f2 authorMichael Snoyman <michael@snoyman.com> dateTue 17 Jan 2017, 13:27 (10 years ago) parentc6a542c38d89fa
1 file changed+4−5
wai-extra/Network/Wai/Middleware/RequestLogger.hs+4−5
wai-extra/Network/Wai/Middleware/RequestLogger.hs+4−5
@@ -95,20 +95,19 @@ mkRequestLogger RequestLoggerSettings{..} = do
9595 Handle h -> (BS.hPutStr h . logToByteString, when autoFlush (hFlush h))
9696 Logger l -> (pushLogStr l, when autoFlush (flushLogStr l))
9797 Callback c -> (c, return ())
98+ callbackAndFlush str = callback str >> flusher
9899 case outputFormat of
99100 Apache ipsrc -> do
100101 getdate <- getDateGetter flusher
101102 apache <- initLogger ipsrc (LogCallback callback flusher) getdate
102103 return $ apacheMiddleware apache
103− Detailed useColors -> detailedMiddleware
104− (\str -> callback str >> flusher)
105− useColors
104+ Detailed useColors -> detailedMiddleware callbackAndFlush useColors
106105 CustomOutputFormat formatter -> do
107106 getDate <- getDateGetter flusher
108− return $ customMiddleware callback getDate formatter
107+ return $ customMiddleware callbackAndFlush getDate formatter
109108 CustomOutputFormatWithDetails formatter -> do
110109 getdate <- getDateGetter flusher
111− return $ customMiddlewareWithDetails callback getdate formatter
110+ return $ customMiddlewareWithDetails callbackAndFlush getdate formatter
112111
113112apacheMiddleware :: ApacheLoggerActions -> Middleware
114113apacheMiddleware ala app req sendResponse = app req $ \res -> do