893b989 · typeable/wai

git.iko.soy/typeable/wai

wai-extra still works with older fast-logger

commit893b9896aba6de986b6a571c9268008ef3126da5 authorMichael Snoyman <michael@snoyman.com> dateTue 4 Sep 2012, 18:35 (14 years ago) parente05ba76

2 files changed+11−2

compare with master

unifiedsplit

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

wai-extra/Network/Wai/Middleware/RequestLogger.hs+9

@@ -1,5 +1,6 @@

11{-# LANGUAGE OverloadedStrings #-}

22{-# LANGUAGE RecordWildCards #-}

3+{-# LANGUAGE CPP #-}

34module Network.Wai.Middleware.RequestLogger

45 ( -- * Basic stdout logging

56 logStdout

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

3738

3839import Data.Default (Default (def))

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

41+#if MIN_VERSION_fast_logger(0,3,0)

4042import System.Date.Cache (ondemandDateCacher)

43+#else

44+import System.Log.FastLogger.Date (getDate, dateInit, ZonedDate)

45+#endif

4146

4247data OutputFormat = Apache IPAddrSource

4348 | Detailed Bool -- ^ use colors?

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

7984 getdate <-

8085 case mgetdate of

8186 Just x -> return x

87+#if MIN_VERSION_fast_logger(0, 3, 0)

8288 Nothing -> do

8389 (getter,_) <- ondemandDateCacher zonedDateCacheConf

8490 return getter

91+#else

92+ Nothing -> fmap getDate dateInit

93+#endif

8594 return $ apacheMiddleware callback ipsrc getdate

8695 Detailed useColors -> detailedMiddleware callback useColors

8796 where

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

@@ -34,8 +34,8 @@ Library

3434 , case-insensitive >= 0.2

3535 , data-default

3636 , date-cache >= 0.3 && < 0.4

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

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

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

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

3939 , conduit >= 0.5 && < 0.6

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

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