From c57ea716b6efca0ee634c81514cd512242293e90 Mon Sep 17 00:00:00 2001 From: Frank Schroeder Date: Thu, 20 Sep 2018 21:59:17 +0200 Subject: [PATCH] fix variable name --- config/config.go | 22 +++++++++++----------- config/load.go | 2 +- main.go | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/config/config.go b/config/config.go index 7a2efd3bb..eb8575558 100644 --- a/config/config.go +++ b/config/config.go @@ -7,17 +7,17 @@ import ( ) type Config struct { - Proxy Proxy - Registry Registry - Listen []Listen - Log Log - Metrics Metrics - UI UI - Runtime Runtime - ProfileMode string - ProfilePath string - Insecure bool - DisableGlobMatching bool + Proxy Proxy + Registry Registry + Listen []Listen + Log Log + Metrics Metrics + UI UI + Runtime Runtime + ProfileMode string + ProfilePath string + Insecure bool + GlobMatchingDisabled bool } type CertSource struct { diff --git a/config/load.go b/config/load.go index 3db6fb3d4..d641dc0ec 100644 --- a/config/load.go +++ b/config/load.go @@ -187,7 +187,7 @@ func load(cmdline, environ, envprefix []string, props *properties.Properties) (c f.StringVar(&cfg.UI.Title, "ui.title", defaultConfig.UI.Title, "optional title for the UI") f.StringVar(&cfg.ProfileMode, "profile.mode", defaultConfig.ProfileMode, "enable profiling mode, one of [cpu, mem, mutex, block]") f.StringVar(&cfg.ProfilePath, "profile.path", defaultConfig.ProfilePath, "path to profile dump file") - f.BoolVar(&cfg.DisableGlobMatching, "glob.matching.disabled", defaultConfig.DisableGlobMatching, "Disable Glob Matching on routes, one of [true, false]") + f.BoolVar(&cfg.GlobMatchingDisabled, "glob.matching.disabled", defaultConfig.GlobMatchingDisabled, "Disable Glob Matching on routes, one of [true, false]") // deprecated flags var proxyLogRoutes string diff --git a/main.go b/main.go index 3ccf43b97..b557b1219 100644 --- a/main.go +++ b/main.go @@ -183,7 +183,7 @@ func newHTTPProxy(cfg *config.Config) http.Handler { Transport: newTransport(nil), InsecureTransport: newTransport(&tls.Config{InsecureSkipVerify: true}), Lookup: func(r *http.Request) *route.Target { - t := route.GetTable().Lookup(r, r.Header.Get("trace"), pick, match, cfg.DisableGlobMatching) + t := route.GetTable().Lookup(r, r.Header.Get("trace"), pick, match, cfg.GlobMatchingDisabled) if t == nil { notFound.Inc(1) log.Print("[WARN] No route for ", r.Host, r.URL)