Macaron: remove custom Request type (#37874)
* remove macaron.Request, use http.Request instead * remove com dependency from bindings module * fix another c.Req.Request
This commit is contained in:
@@ -372,7 +372,7 @@ func (srv AlertmanagerSrv) RoutePostTestReceivers(c *models.ReqContext, body api
|
||||
|
||||
ctx, cancelFunc, err := contextWithTimeoutFromRequest(
|
||||
c.Req.Context(),
|
||||
c.Req.Request,
|
||||
c.Req,
|
||||
defaultTestReceiversTimeout,
|
||||
maxTestReceiversTimeout)
|
||||
if err != nil {
|
||||
|
||||
@@ -103,7 +103,7 @@ func (p *AlertingProxy) withReq(
|
||||
req.Header.Add(h, v)
|
||||
}
|
||||
newCtx, resp := replacedResponseWriter(ctx)
|
||||
newCtx.Req.Request = req
|
||||
newCtx.Req = req
|
||||
p.DataProxy.ProxyDatasourceRequestWithID(newCtx, ctx.ParamsInt64("Recipient"))
|
||||
|
||||
status := resp.Status()
|
||||
|
||||
Reference in New Issue
Block a user