TyleoDvDelaware3217/GoDoxy
1
0
Fork 0
mirror of https://github.com/yusing/godoxy.git synced 2025-06-09 13:02:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

removed unnecessary PatchReverseProxy argument

Browse source
This commit is contained in:
yusing 2024-11-13 04:47:42 +08:00
parent b162dcbfbe
commit 6a2638c70c
3 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
internal/net/http/middleware/middleware.go
View file

@ -142,18 +142,18 @@ func createMiddlewares(middlewaresMap map[string]OptionsRaw) ([]*Middleware, E.E
return middlewares, errs.Error() return middlewares, errs.Error()
} }
func PatchReverseProxy(rpName string, rp *ReverseProxy, middlewaresMap map[string]OptionsRaw) (err E.Error) { func PatchReverseProxy(rp *ReverseProxy, middlewaresMap map[string]OptionsRaw) (err E.Error) {
var middlewares []*Middleware var middlewares []*Middleware
middlewares, err = createMiddlewares(middlewaresMap) middlewares, err = createMiddlewares(middlewaresMap)
if err != nil { if err != nil {
return return
} }
patchReverseProxy(rpName, rp, middlewares) patchReverseProxy(rp, middlewares)
return return
} }
func patchReverseProxy(rpName string, rp *ReverseProxy, middlewares []*Middleware) { func patchReverseProxy(rp *ReverseProxy, middlewares []*Middleware) {
mid := BuildMiddlewareFromChain(rpName, middlewares) mid := BuildMiddlewareFromChain(rp.TargetName, middlewares)
if mid.before != nil { if mid.before != nil {
ori := rp.HandlerFunc ori := rp.HandlerFunc

4
internal/net/http/middleware/test_utils.go
View file

@ -114,12 +114,12 @@ func newMiddlewareTest(middleware *Middleware, args *testArgs) (*TestResult, E.E
} else { } else {
proxyURL, _ = url.Parse("https://" + testHost) // dummy url, no actual effect proxyURL, _ = url.Parse("https://" + testHost) // dummy url, no actual effect
} }
rp := gphttp.NewReverseProxy("test", types.NewURL(proxyURL), &rr) rp := gphttp.NewReverseProxy(middleware.name, types.NewURL(proxyURL), &rr)
mid, setOptErr := middleware.WithOptionsClone(args.middlewareOpt) mid, setOptErr := middleware.WithOptionsClone(args.middlewareOpt)
if setOptErr != nil { if setOptErr != nil {
return nil, setOptErr return nil, setOptErr
} }
patchReverseProxy(middleware.name, rp, []*Middleware{mid}) patchReverseProxy(rp, []*Middleware{mid})
rp.ServeHTTP(w, req) rp.ServeHTTP(w, req)
resp := w.Result() resp := w.Result()
defer resp.Body.Close() defer resp.Body.Close()

6
internal/route/http.go
View file

@ -71,7 +71,7 @@ func NewHTTPRoute(entry *entry.ReverseProxyEntry) (impl, E.Error) {
rp := gphttp.NewReverseProxy(service, entry.URL, trans) rp := gphttp.NewReverseProxy(service, entry.URL, trans)
if len(entry.Middlewares) > 0 { if len(entry.Middlewares) > 0 {
err := middleware.PatchReverseProxy(service, rp, entry.Middlewares) err := middleware.PatchReverseProxy(rp, entry.Middlewares)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -157,6 +157,10 @@ func (r *HTTPRoute) Finish(reason any) {
r.task.Finish(reason) r.task.Finish(reason)
} }
func (r *HTTPRoute) ServeHTTP(w http.ResponseWriter, req *http.Request) {
r.handler.ServeHTTP(w, req)
}
func (r *HTTPRoute) addToLoadBalancer() { func (r *HTTPRoute) addToLoadBalancer() {
var lb *loadbalancer.LoadBalancer var lb *loadbalancer.LoadBalancer
linked, ok := httpRoutes.Load(r.LoadBalance.Link) linked, ok := httpRoutes.Load(r.LoadBalance.Link)