remove abort, actually the abort is unuse

This commit is contained in:
eyasliu
2021-01-17 17:26:53 +08:00
parent 5b17108f71
commit c5145dc4f6

View File

@ -1,7 +1,6 @@
package ghttp
import (
"github.com/gogf/gf/errors/gerror"
"net/http"
)
@ -29,17 +28,6 @@ func (c *Client) MiddlewareNext(req *http.Request) (*ClientResponse, error) {
return c.callRequest(req)
}
// MiddlewareAbort stop call after all middleware, so it will not send http request
// this is should only be call in ClientHandlerFunc
func (c *Client) MiddlewareAbort(req *http.Request) (*ClientResponse, error) {
m, ok := req.Context().Value(gfHTTPClientMiddlewareKey).(*clientMiddleware)
if ok {
m.Abort()
return m.resp, m.err
}
return nil, gerror.New("http request abort")
}
// ClientHandlerFunc middleware handler func
type ClientHandlerFunc = func(c *Client, r *http.Request) (*ClientResponse, error)
@ -48,14 +36,13 @@ type clientMiddleware struct {
client *Client // http client
handlers []ClientHandlerFunc // mdl handlers
handlerIndex int // current handler index
abort bool // abort call after handlers
resp *ClientResponse // save resp
err error // save err
}
// Next call next middleware handler, if abort,
func (m *clientMiddleware) Next(req *http.Request) (resp *ClientResponse, err error) {
if m.abort || m.err != nil {
if m.err != nil {
return m.resp, m.err
}
if m.handlerIndex < len(m.handlers) {
@ -66,10 +53,3 @@ func (m *clientMiddleware) Next(req *http.Request) (resp *ClientResponse, err er
}
return
}
func (m *clientMiddleware) Abort() {
m.abort = true
if m.err == nil {
m.err = gerror.New("http request abort")
}
}