Rename Matcher to Glob

route/matcher.go

@@ -21,5 +21,5 @@ func prefixMatcher(uri string, r *Route) bool {
 
 // globMatcher matches path to the routes' path using gobwas/glob.
 func globMatcher(uri string, r *Route) bool {
-	return r.Matcher.Match(uri)
+	return r.Glob.Match(uri)
 }

route/matcher_test.go

@@ -61,5 +61,5 @@ func TestGlobMatcher(t *testing.T) {
 }
 
 func getRoute(path string) *Route {
-	return &Route{Path: path, Matcher: glob.MustCompile(path)}
+	return &Route{Path: path, Glob: glob.MustCompile(path)}
 }

route/route.go

@@ -9,8 +9,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/gobwas/glob"
 	"github.com/fabiolb/fabio/metrics"
+	"github.com/gobwas/glob"
 )
 
 // Route maps a path prefix to one or more target URLs.
@@ -39,7 +39,7 @@ type Route struct {
 	total uint64
 
 	// Matcher represents compiled pattern.
-	Matcher glob.Glob
+	Glob glob.Glob
 }
 
 func (r *Route) addTarget(service string, targetURL *url.URL, fixedWeight float64, tags []string, opts map[string]string) {

route/table.go

@@ -13,8 +13,8 @@ import (
 	"sync/atomic"
 
 	"github.com/fabiolb/fabio/metrics"
-	"github.com/ryanuber/go-glob"
 	glob2 "github.com/gobwas/glob"
+	"github.com/ryanuber/go-glob"
 )
 
 var errInvalidPrefix = errors.New("route: prefix must not be empty")
@@ -154,7 +154,7 @@ func (t Table) addRoute(d *RouteDef) error {
 	switch {
 	// add new host
 	case t[host] == nil:
-		r := &Route{Host: host, Path: path, Matcher: glob2.MustCompile(path)}
+		r := &Route{Host: host, Path: path, Glob: glob2.MustCompile(path)}
 		r.addTarget(d.Service, targetURL, d.Weight, d.Tags, d.Opts)
 		t[host] = Routes{r}