git.iko.soy/typeable/wai
on master help sign in
wai-extra still works with older fast-logger
893b989Michael Snoyman
wai-extra/Network/Wai/Middleware/RequestLogger.hs+9
compare with master
unifiedsplit
@@ -1,5 +1,6 @@
1{-# LANGUAGE OverloadedStrings #-}
1{-# LANGUAGE OverloadedStrings #-}
2{-# LANGUAGE RecordWildCards #-}
2{-# LANGUAGE RecordWildCards #-}
3+{-# LANGUAGE CPP #-}
3module Network.Wai.Middleware.RequestLogger
4module Network.Wai.Middleware.RequestLogger
4 ( -- * Basic stdout logging
5 ( -- * Basic stdout logging
5 logStdout
6 logStdout
@@ -37,7 +38,11 @@ import System.IO.Unsafe
37
38
38import Data.Default (Default (def))
39import Data.Default (Default (def))
39import Network.Wai.Logger.Format (apacheFormat, IPAddrSource (..))
40import Network.Wai.Logger.Format (apacheFormat, IPAddrSource (..))
41+#if MIN_VERSION_fast_logger(0,3,0)
40import System.Date.Cache (ondemandDateCacher)
42import System.Date.Cache (ondemandDateCacher)
43+#else
44+import System.Log.FastLogger.Date (getDate, dateInit, ZonedDate)
45+#endif
41
46
42data OutputFormat = Apache IPAddrSource
47data OutputFormat = Apache IPAddrSource
43 | Detailed Bool -- ^ use colors?
48 | Detailed Bool -- ^ use colors?
@@ -79,9 +84,13 @@ mkRequestLogger RequestLoggerSettings{..} = do
79 getdate <-
84 getdate <-
80 case mgetdate of
85 case mgetdate of
81 Just x -> return x
86 Just x -> return x
87+#if MIN_VERSION_fast_logger(0, 3, 0)
82 Nothing -> do
88 Nothing -> do
83 (getter,_) <- ondemandDateCacher zonedDateCacheConf
89 (getter,_) <- ondemandDateCacher zonedDateCacheConf
84 return getter
90 return getter
91+#else
92+ Nothing -> fmap getDate dateInit
93+#endif
85 return $ apacheMiddleware callback ipsrc getdate
94 return $ apacheMiddleware callback ipsrc getdate
86 Detailed useColors -> detailedMiddleware callback useColors
95 Detailed useColors -> detailedMiddleware callback useColors
87 where
96 where
wai-extra/wai-extra.cabal+2−2
@@ -34,8 +34,8 @@ Library
34 , case-insensitive >= 0.2
34 , case-insensitive >= 0.2
35 , data-default
35 , data-default
36 , date-cache >= 0.3 && < 0.4
36 , date-cache >= 0.3 && < 0.4
37− , fast-logger >= 0.3 && < 0.4
37+ , fast-logger >= 0.2 && < 0.4
38− , wai-logger >= 0.3 && < 0.4
38+ , wai-logger >= 0.2 && < 0.4
39 , conduit >= 0.5 && < 0.6
39 , conduit >= 0.5 && < 0.6
40 , zlib-conduit >= 0.5 && < 0.6
40 , zlib-conduit >= 0.5 && < 0.6
41 , blaze-builder-conduit >= 0.5 && < 0.6
41 , blaze-builder-conduit >= 0.5 && < 0.6