From 6bf36d922ca1ae937699fec790e2c39471ba9dd4 Mon Sep 17 00:00:00 2001 From: Matthew Holt Date: Sat, 28 Mar 2015 16:56:56 -0600 Subject: [PATCH] Refactored proxy middleware to return errors --- middleware/proxy/proxy.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/middleware/proxy/proxy.go b/middleware/proxy/proxy.go index 29cb29f36..1319ea3dc 100644 --- a/middleware/proxy/proxy.go +++ b/middleware/proxy/proxy.go @@ -24,8 +24,8 @@ func New(c middleware.Controller) (middleware.Middleware, error) { rules = append(rules, rule) } - return func(next http.HandlerFunc) http.HandlerFunc { - return func(w http.ResponseWriter, r *http.Request) { + return func(next middleware.HandlerFunc) middleware.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) (int, error) { for _, rule := range rules { if middleware.Path(r.URL.Path).Matches(rule.from) { @@ -45,11 +45,11 @@ func New(c middleware.Controller) (middleware.Middleware, error) { // TODO: Construct this before; not during every request, if possible proxy := httputil.NewSingleHostReverseProxy(baseUrl) proxy.ServeHTTP(w, r) - - } else { - next(w, r) + return 0, nil } } + + return next(w, r) } }, nil }