git.iko.soy/typeable/wai
on master help sign in
fast-logger 2.1 support
commit19bd886dd47fa0542122791d4520e82dae64fa37 authorMichael Snoyman <michael@snoyman.com> dateThu 26 Dec 2013, 13:54 (13 years ago) parent6e6e918
4 files changed+22−7
compare with master
unifiedsplit
wai-extra/Network/Wai/Middleware/RequestLogger.hs+1−1 wai-extra/Network/Wai/Middleware/RequestLogger/Internal.hs+16−1 wai-extra/test/WaiExtraTest.hs+1−1 wai-extra/wai-extra.cabal+4−4
wai-extra/Network/Wai/Middleware/RequestLogger.hs+1−1
@@ -81,7 +81,7 @@ mkRequestLogger :: RequestLoggerSettings -> IO Middleware
8181mkRequestLogger RequestLoggerSettings{..} = do
8282 callback <-
8383 case destination of
84− Handle h -> return $ BS.hPutStr h . toByteString . logStrBuilder
84+ Handle h -> return $ BS.hPutStr h . logToByteString
8585 Logger l -> return $ pushLogStr l
8686 Callback c -> return c
8787 case outputFormat of
wai-extra/Network/Wai/Middleware/RequestLogger/Internal.hs+16−1
@@ -4,12 +4,22 @@
44-- https://github.com/yesodweb/wai/issues/192
55module Network.Wai.Middleware.RequestLogger.Internal
66 ( module Network.Wai.Middleware.RequestLogger.Internal
7− , toByteString
7+ , logToByteString
88 ) where
99
1010import Data.ByteString (ByteString)
1111import Network.Wai.Logger (clockDateCacher)
1212
13+#if MIN_VERSION_fast_logger(2, 1, 0)
14+import System.Log.FastLogger (LogStr, fromLogStr)
15+
16+logToByteString :: LogStr -> ByteString
17+logToByteString = fromLogStr
18+
19+#else
20+
21+import System.Log.FastLogger (LogStr, logStrBuilder)
22+
1323#if MIN_VERSION_bytestring(0, 10, 2)
1424import Data.ByteString.Builder (toLazyByteString, Builder)
1525import qualified Data.ByteString.Lazy as L
@@ -21,5 +31,10 @@ toByteString = L.toStrict . toLazyByteString
2131import Blaze.ByteString.Builder (toByteString)
2232#endif
2333
34+logToByteString :: LogStr -> ByteString
35+logToByteString = toByteString . logStrBuilder
36+
37+#endif
38+
2439getDateGetter :: IO (IO ByteString)
2540getDateGetter = fmap fst clockDateCacher
wai-extra/test/WaiExtraTest.hs+1−1
@@ -557,7 +557,7 @@ caseDebugRequestBody = do
557557 where
558558 output = TE.encodeUtf8 $ T.toStrict output'
559559
560− logToBs = toByteString . logStrBuilder
560+ logToBs = fromLogStr
561561
562562 {-debugApp = debug $ \req -> do-}
563563 {-return $ responseLBS status200 [ ] ""-}
wai-extra/wai-extra.cabal+4−4
@@ -1,5 +1,5 @@
11Name: wai-extra
2−Version: 2.0.1.1
2+Version: 2.0.1.2
33Synopsis: Provides some basic WAI handlers and middleware.
44Description: The goal here is to provide common features without many dependencies.
55License: MIT
@@ -33,8 +33,8 @@ Library
3333 , text >= 0.7
3434 , case-insensitive >= 0.2
3535 , data-default
36− , fast-logger >= 2.0 && < 2.1
37− , wai-logger >= 2.0 && < 2.1
36+ , fast-logger >= 2.0 && < 2.2
37+ , wai-logger >= 2.0 && < 2.2
3838 , conduit >= 1.0 && < 1.1
3939 , zlib-conduit >= 0.5 && < 1.1
4040 , blaze-builder-conduit >= 0.5 && < 1.1
@@ -86,7 +86,7 @@ test-suite tests
8686 , blaze-builder >= 0.2.1.4 && < 0.4
8787 , data-default
8888 , conduit
89− , fast-logger
89+ , fast-logger >= 2.1
9090 , resourcet
9191 ghc-options: -Wall
9292