453bb1e · typeable/wai

git.iko.soy/typeable/wai

caching up to fast-logger 0.3.

commit453bb1e9dba4ead048976d3f0e3341b0cae13e4f authorKazu Yamamoto <kazu@iij.ad.jp> dateMon 3 Sep 2012, 11:21 (14 years ago) parent96259cf

2 files changed+7−4

unifiedsplit

wai-extra/Network/Wai/Middleware/RequestLogger.hs+4−2

@@ -37,7 +37,7 @@ import System.IO.Unsafe

3737

3838import Data.Default (Default (def))

3939import Network.Wai.Logger.Format (apacheFormat, IPAddrSource (..))

40−import System.Log.FastLogger.Date (getDate, dateInit, ZonedDate)

40+import System.Date.Cache (ondemandDateCacher)

4141

4242data OutputFormat = Apache IPAddrSource

4343 | Detailed Bool -- ^ use colors?

@@ -79,7 +79,9 @@ mkRequestLogger RequestLoggerSettings{..} = do

7979 getdate <-

8080 case mgetdate of

8181 Just x -> return x

82− Nothing -> fmap getDate dateInit

82+ Nothing -> do

83+ (getter,_) <- ondemandDateCacher zonedDateCacheConf

84+ return getter

8385 return $ apacheMiddleware callback ipsrc getdate

8486 Detailed useColors -> detailedMiddleware callback useColors

8587 where

wai-extra/wai-extra.cabal+3−2

@@ -33,8 +33,9 @@ Library

3333 , text >= 0.7 && < 0.12

3434 , case-insensitive >= 0.2

3535 , data-default

36− , fast-logger >= 0.2 && < 0.3

37− , wai-logger >= 0.2 && < 0.3

36+ , date-cache >= 0.3 && < 0.4

37+ , fast-logger >= 0.3 && < 0.4

38+ , wai-logger >= 0.3 && < 0.4

3839 , conduit >= 0.5 && < 0.6

3940 , zlib-conduit >= 0.5 && < 0.6

4041 , blaze-builder-conduit >= 0.5 && < 0.6