From eb539bc78ed222149ba8ae1ce4da1d143f6e1c41 Mon Sep 17 00:00:00 2001
From: David Christofas <dchristofas@owncloud.com>
Date: Tue, 24 Mar 2020 10:42:47 +0100
Subject: [PATCH] implement review feedback

---
 pkg/config/config.go |  6 +++---
 pkg/proxy/proxy.go   | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkg/config/config.go b/pkg/config/config.go
index 426e705ba3..f397c25ffa 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -55,11 +55,11 @@ type RouteType string
 
 const (
 	// PrefixRoute are routes matched by a prefix
-	PrefixRoute RouteType = "Prefix"
+	PrefixRoute RouteType = "prefix"
 	// QueryRoute are routes machted by a prefix and query parameters
-	QueryRoute RouteType = "Query"
+	QueryRoute RouteType = "query"
 	// RegexRoute are routes matched by a pattern
-	RegexRoute RouteType = "Regex"
+	RegexRoute RouteType = "regex"
 	// DefaultRouteType is the PrefixRoute
 	DefaultRouteType RouteType = PrefixRoute
 )
diff --git a/pkg/proxy/proxy.go b/pkg/proxy/proxy.go
index b3fb92e485..748105ceaa 100644
--- a/pkg/proxy/proxy.go
+++ b/pkg/proxy/proxy.go
@@ -120,20 +120,20 @@ func (p *MultiHostReverseProxy) ServeHTTP(w http.ResponseWriter, r *http.Request
 		var handler func(string, url.URL) bool
 		switch routeType {
 		case config.QueryRoute:
-			handler = p.queryRouteHandler
+			handler = p.queryRouteMatcher
 		case config.RegexRoute:
-			handler = p.regexRouteHandler
+			handler = p.regexRouteMatcher
 		case config.PrefixRoute:
 			fallthrough
 		default:
-			handler = p.prefixRouteHandler
+			handler = p.prefixRouteMatcher
 		}
 		for endpoint := range p.Directors[policy][routeType] {
 			if handler(endpoint, *r.URL) {
 				p.Director = p.Directors[policy][routeType][endpoint]
 				hit = true
 				p.logger.
-					Info().
+					Debug().
 					Str("policy", policy).
 					Str("prefix", endpoint).
 					Str("path", r.URL.Path).
@@ -153,7 +153,7 @@ func (p *MultiHostReverseProxy) ServeHTTP(w http.ResponseWriter, r *http.Request
 	p.ReverseProxy.ServeHTTP(w, r)
 }
 
-func (p MultiHostReverseProxy) queryRouteHandler(endpoint string, target url.URL) bool {
+func (p MultiHostReverseProxy) queryRouteMatcher(endpoint string, target url.URL) bool {
 	u, _ := url.Parse(endpoint)
 	if strings.HasPrefix(target.Path, u.Path) && endpoint != "/" {
 		query := u.Query()
@@ -174,7 +174,7 @@ func (p MultiHostReverseProxy) queryRouteHandler(endpoint string, target url.URL
 	return false
 }
 
-func (p *MultiHostReverseProxy) regexRouteHandler(endpoint string, target url.URL) bool {
+func (p *MultiHostReverseProxy) regexRouteMatcher(endpoint string, target url.URL) bool {
 	matched, err := regexp.MatchString(endpoint, target.String())
 	if err != nil {
 		p.logger.Warn().Err(err).Msgf("regex with pattern %s failed", endpoint)
@@ -182,7 +182,7 @@ func (p *MultiHostReverseProxy) regexRouteHandler(endpoint string, target url.UR
 	return matched
 }
 
-func (p *MultiHostReverseProxy) prefixRouteHandler(endpoint string, target url.URL) bool {
+func (p *MultiHostReverseProxy) prefixRouteMatcher(endpoint string, target url.URL) bool {
 	return strings.HasPrefix(target.Path, endpoint) && endpoint != "/"
 }