on master help sign in
Drop fast-logger-2.0 support in wai-extra
commit84dae37c2ba829e0d4d28ee8419e5e7e48840939 authorMichael Snoyman <michael@snoyman.com> dateSun 9 Mar 2014, 07:47 (13 years ago) parent0408c10
2 files changed+3−27
wai-extra/Network/Wai/Middleware/RequestLogger/Internal.hs−24 wai-extra/wai-extra.cabal+3−3
wai-extra/Network/Wai/Middleware/RequestLogger/Internal.hs−24
@@ -4,9 +4,6 @@
44-- https://github.com/yesodweb/wai/issues/192
55module Network.Wai.Middleware.RequestLogger.Internal
66 ( module Network.Wai.Middleware.RequestLogger.Internal
7−#if !MIN_VERSION_fast_logger(2, 1, 0)
8− , logToByteString
9−#endif
107 ) where
118
129import Data.ByteString (ByteString)
@@ -14,32 +11,11 @@ import Network.Wai.Logger (clockDateCacher)
1411import Control.Concurrent (forkIO, threadDelay)
1512import Control.Monad (forever)
1613
17−#if MIN_VERSION_fast_logger(2, 1, 0)
1814import System.Log.FastLogger (LogStr, fromLogStr)
1915
2016logToByteString :: LogStr -> ByteString
2117logToByteString = fromLogStr
2218
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−
4319getDateGetter :: IO () -- ^ flusher
4420 -> IO (IO ByteString)
4521getDateGetter flusher = do
wai-extra/wai-extra.cabal+3−3
@@ -1,5 +1,5 @@
11Name: wai-extra
2−Version: 2.0.3.4
2+Version: 2.1.0
33Synopsis: Provides some basic WAI handlers and middleware.
44Description: The goal here is to provide common features without many dependencies.
55License: MIT
@@ -22,7 +22,7 @@ extra-source-files:
2222Library
2323 Build-Depends: base >= 4 && < 5
2424 , bytestring >= 0.9.1.4
25− , wai >= 2.0 && < 2.2
25+ , wai >= 2.1 && < 2.2
2626 , old-locale >= 1.0.0.2 && < 1.1
2727 , time >= 1.1.4
2828 , network >= 2.2.1.5
@@ -33,7 +33,7 @@ Library
3333 , text >= 0.7
3434 , case-insensitive >= 0.2
3535 , data-default
36− , fast-logger >= 2.0 && < 2.2
36+ , fast-logger >= 2.1 && < 2.2
3737 , wai-logger >= 2.0 && < 2.2
3838 , conduit >= 1.0 && < 1.1
3939 , zlib-conduit >= 0.5 && < 1.1