on f76cd3a help sign in
4 files changed+59−9
since splitsnapshots
unifiedsplit
stack.yaml+36−1 wai-extra/ChangeLog.md+4 wai-extra/Network/Wai/Middleware/RequestLogger.hs+18−7 wai-extra/wai-extra.cabal+1−1
stack.yamlmode 120000 → 100644+36−1
@@ -1 +0,0 @@
1−stack-lts-12.yaml
@@ -0,0 +1,36 @@
1+resolver: lts-11.13
2+
3+packages:
4+- ./auto-update
5+- ./mime-types
6+- ./wai
7+- ./wai-extra
8+- ./warp
9+- ./warp-tls
10+- ./wai-app-static
11+- ./wai-handler-fastcgi
12+- ./wai-websockets
13+- ./wai-conduit
14+flags:
15+ wai-extra:
16+ build-example: true
17+extra-deps:
18+- bsb-http-chunked-0
19+- tls-session-manager-0.0.0.2
20+- psqueues-0.2.4.0
21+- streaming-commons-0.2.0.0
22+- wai-logger-2.3.2
23+- http-client-0.5.10
24+- websockets-0.12.4.0
25+- binary-0.8.5.1
26+nix:
27+ enable: false
28+ packages:
29+ - fcgi
30+ - zlib
31+image:
32+ containers:
33+ - base: "fpco/pid1"
34+ name: "yesodweb/warp"
35+ executables:
36+ - warp
wai-extra/ChangeLog.md+4
@@ -1,5 +1,9 @@
11# Changelog for wai-extra
22
3+## 3.0.25.0
4+
5+* Export `defaultRequestLoggerSettings` [#696](https://github.com/yesodweb/wai/pull/696)
6+
37## 3.0.24.2
48
59* Consider quoted multipart form boundary markers [#700](https://github.com/yesodweb/wai/pull/700).
wai-extra/Network/Wai/Middleware/RequestLogger.hs+18−7
@@ -7,7 +7,8 @@ module Network.Wai.Middleware.RequestLogger
77 , logStdoutDev
88 -- * Create more versions
99 , mkRequestLogger
10− , RequestLoggerSettings
10+ , defaultRequestLoggerSettings
11+ , RequestLoggerSettings (..)
1112 , outputFormat
1213 , autoFlush
1314 , destination
@@ -64,7 +65,9 @@ data Destination = Handle Handle
6465
6566type Callback = LogStr -> IO ()
6667
67−-- | @RequestLoggerSettings@ is an instance of Default. See <https://hackage.haskell.org/package/data-default Data.Default> for more information.
68+-- | @RequestLoggerSettings@ is an instance of Default.
69+-- See <https://hackage.haskell.org/package/data-default Data.Default>
70+-- for more information.
6871--
6972-- @outputFormat@, @autoFlush@, and @destination@ are record fields
7073-- for the record type @RequestLoggerSettings@, so they can be used to
@@ -81,12 +84,20 @@ data RequestLoggerSettings = RequestLoggerSettings
8184 , destination :: Destination
8285 }
8386
87+-- | @defaultRequestLoggerSettings@ is the original 'Default' instance
88+-- factored out into a top-level declared variable.
89+--
90+-- @since 3.0.25.0
91+defaultRequestLoggerSettings :: RequestLoggerSettings
92+defaultRequestLoggerSettings =
93+ RequestLoggerSettings
94+ { outputFormat = Detailed True
95+ , autoFlush = True
96+ , destination = Handle stdout
97+ }
98+
8499instance Default RequestLoggerSettings where
85− def = RequestLoggerSettings
86− { outputFormat = Detailed True
87− , autoFlush = True
88− , destination = Handle stdout
89− }
100+ def = defaultRequestLoggerSettings
90101
91102mkRequestLogger :: RequestLoggerSettings -> IO Middleware
92103mkRequestLogger RequestLoggerSettings{..} = do
wai-extra/wai-extra.cabal+1−1
@@ -1,5 +1,5 @@
11Name: wai-extra
2−Version: 3.0.24.2
2+Version: 3.0.25.0
33Synopsis: Provides some basic WAI handlers and middleware.
44description:
55 Provides basic WAI handler and middleware functionality: