9c0435f · typeable/wai

git.iko.soy/typeable/wai

cleaning up server push logger.

commit9c0435f98e24f3965e8522e50fefd7f9fa0f89c4 authorKazu Yamamoto <kazu@iij.ad.jp> dateThu 30 Jun 2016, 22:23 (10 years ago) parent93776e3

3 files changed+4−12

compare with master

unifiedsplit

warp/Network/Wai/Handler/Warp.hs+1−6 warp/Network/Wai/Handler/Warp/HTTP2/Worker.hs+1−4 warp/Network/Wai/Handler/Warp/Settings.hs+2−2

warp/Network/Wai/Handler/Warp.hs+1−6

@@ -385,12 +385,7 @@ setLogger lgr y = y { settingsLogger = lgr }

385385-- | Setting a log function for HTTP/2 server push.

386386--

387387-- Since: 3.2.7

388−setServerPushLogger :: (SockAddr

389− -> ByteString

390− -> Integer

391− -> ByteString

392− -> Maybe ByteString

393− -> IO ()) -- ^ socket address, URL path, file size, referer, maybe user-agent

388+setServerPushLogger :: (Request -> ByteString -> Integer -> IO ()) -- ^ request, path, file-size

394389 -> Settings

395390 -> Settings

396391setServerPushLogger lgr y = y { settingsServerPushLogger = lgr }

warp/Network/Wai/Handler/Warp/HTTP2/Worker.hs+1−4

@@ -77,9 +77,6 @@ pushStream ctx@Context{http2settings,outputQ,streamTable}

7777 !pps0 = http2dataPushPromise h2d

7878 !len = length pps0

7979 !pushLogger = S.settingsServerPushLogger settings

80− !sa = remoteHost req

81− !mua = requestHeaderUserAgent req

82− !referer = rawPathInfo req

8380 increment tvar = atomically $ modifyTVar' tvar (+1)

8481 waiter lim tvar = atomically $ do

8582 n <- readTVar tvar

@@ -112,7 +109,7 @@ pushStream ctx@Context{http2settings,outputQ,streamTable}

112109 !rsp = RspnFile H.ok200 (ths,vt) file (Just part)

113110 !ths = (tokenLastModified,date) :

114111 addContentHeadersForFilePart ths0 part

115− pushLogger sa path size referer mua

112+ pushLogger req path size

116113 let out = OPush strm promisedRequest rsp ii (increment tvar) pid

117114 enqueueOutput outputQ out

118115 push tvar pps (n + 1)

warp/Network/Wai/Handler/Warp/Settings.hs+2−2

@@ -101,7 +101,7 @@ data Settings = Settings

101101 -- ^ A log function. Default: no action.

102102 --

103103 -- Since 3.X.X.

104− , settingsServerPushLogger :: SockAddr -> ByteString -> Integer -> ByteString -> Maybe ByteString -> IO ()

104+ , settingsServerPushLogger :: Request -> ByteString -> Integer -> IO ()

105105 -- ^ A HTTP/2 server push log function. Default: no action.

106106 --

107107 -- Since 3.X.X.

@@ -144,7 +144,7 @@ defaultSettings = Settings

144144 , settingsSlowlorisSize = 2048

145145 , settingsHTTP2Enabled = True

146146 , settingsLogger = \_ _ _ -> return ()

147− , settingsServerPushLogger = \_ _ _ _ _ -> return ()

147+ , settingsServerPushLogger = \_ _ _ -> return ()

148148 , settingsGracefulShutdownTimeout = Nothing

149149 }

150150