git.iko.soy/typeable/wai
on master help sign in
Drop fast-logger-2.0 support in wai-extra
84dae37Michael Snoyman
wai-extra/Network/Wai/Middleware/RequestLogger/Internal.hs−24
compare with master
unifiedsplit
@@ -4,9 +4,6 @@
4-- https://github.com/yesodweb/wai/issues/192
4-- https://github.com/yesodweb/wai/issues/192
5module Network.Wai.Middleware.RequestLogger.Internal
5module Network.Wai.Middleware.RequestLogger.Internal
6 ( module Network.Wai.Middleware.RequestLogger.Internal
6 ( module Network.Wai.Middleware.RequestLogger.Internal
7−#if !MIN_VERSION_fast_logger(2, 1, 0)
8− , logToByteString
9−#endif
10 ) where
7 ) where
11
8
12import Data.ByteString (ByteString)
9import Data.ByteString (ByteString)
@@ -14,32 +11,11 @@ import Network.Wai.Logger (clockDateCacher)
14import Control.Concurrent (forkIO, threadDelay)
11import Control.Concurrent (forkIO, threadDelay)
15import Control.Monad (forever)
12import Control.Monad (forever)
16
13
17−#if MIN_VERSION_fast_logger(2, 1, 0)
18import System.Log.FastLogger (LogStr, fromLogStr)
14import System.Log.FastLogger (LogStr, fromLogStr)
19
15
20logToByteString :: LogStr -> ByteString
16logToByteString :: LogStr -> ByteString
21logToByteString = fromLogStr
17logToByteString = fromLogStr
22
18
23−#else
24−
25−import System.Log.FastLogger (LogStr, logStrBuilder)
26−
27−#if MIN_VERSION_bytestring(0, 10, 2)
28−import Data.ByteString.Builder (toLazyByteString, Builder)
29−import qualified Data.ByteString.Lazy as L
30−
31−toByteString :: Builder -> ByteString
32−toByteString = L.toStrict . toLazyByteString
33−
34−#else
35−import Blaze.ByteString.Builder (toByteString)
36−#endif
37−
38−logToByteString :: LogStr -> ByteString
39−logToByteString = toByteString . logStrBuilder
40−
41−#endif
42−
43getDateGetter :: IO () -- ^ flusher
19getDateGetter :: IO () -- ^ flusher
44 -> IO (IO ByteString)
20 -> IO (IO ByteString)
45getDateGetter flusher = do
21getDateGetter flusher = do
wai-extra/wai-extra.cabal+3−3
@@ -1,5 +1,5 @@
1Name: wai-extra
1Name: wai-extra
2−Version: 2.0.3.4
2+Version: 2.1.0
3Synopsis: Provides some basic WAI handlers and middleware.
3Synopsis: Provides some basic WAI handlers and middleware.
4Description: The goal here is to provide common features without many dependencies.
4Description: The goal here is to provide common features without many dependencies.
5License: MIT
5License: MIT
@@ -22,7 +22,7 @@ extra-source-files:
22Library
22Library
23 Build-Depends: base >= 4 && < 5
23 Build-Depends: base >= 4 && < 5
24 , bytestring >= 0.9.1.4
24 , bytestring >= 0.9.1.4
25− , wai >= 2.0 && < 2.2
25+ , wai >= 2.1 && < 2.2
26 , old-locale >= 1.0.0.2 && < 1.1
26 , old-locale >= 1.0.0.2 && < 1.1
27 , time >= 1.1.4
27 , time >= 1.1.4
28 , network >= 2.2.1.5
28 , network >= 2.2.1.5
@@ -33,7 +33,7 @@ Library
33 , text >= 0.7
33 , text >= 0.7
34 , case-insensitive >= 0.2
34 , case-insensitive >= 0.2
35 , data-default
35 , data-default
36− , fast-logger >= 2.0 && < 2.2
36+ , fast-logger >= 2.1 && < 2.2
37 , wai-logger >= 2.0 && < 2.2
37 , wai-logger >= 2.0 && < 2.2
38 , conduit >= 1.0 && < 1.1
38 , conduit >= 1.0 && < 1.1
39 , zlib-conduit >= 0.5 && < 1.1
39 , zlib-conduit >= 0.5 && < 1.1