Skip to content

Commit 0ae485a

Browse files
evkuzinevkuzin
committed
fix
1 parent 5e7d7b0 commit 0ae485a

File tree

10 files changed

+24
-43
lines changed

10 files changed

+24
-43
lines changed

‎main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ func newHTTPProxy(cfg *config.Config, statsHandler *proxy.HttpStatsHandler) *pro
228228
Transport: transport.NewTransport(nil),
229229
InsecureTransport: transport.NewTransport(&tls.Config{InsecureSkipVerify: true}),
230230
Lookup: func(r *http.Request) *route.Target {
231-
t := route.GetTable().Lookup(r, "", pick, match, globCache, cfg.GlobMatchingDisabled)
231+
t := route.GetTable().Lookup(r, pick, match, globCache, cfg.GlobMatchingDisabled)
232232
if t == nil {
233233
statsHandler.Noroute.Add(1)
234234
log.Print("[WARN] No route for ", r.Host, r.URL)

‎proxy/grpc_handler.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ func (g GrpcProxyInterceptor) lookup(ctx context.Context, fullMethodName string)
162162
Header: headers,
163163
}
164164

165-
return route.GetTable().Lookup(req, "", pick, match, g.GlobCache, g.Config.GlobMatchingDisabled), nil
165+
return route.GetTable().Lookup(req, pick, match, g.GlobCache, g.Config.GlobMatchingDisabled), nil
166166
}
167167

168168
// grpc client can specify a destination host in metadata by key 'dsthost', e.g. dsthost=betatest

‎proxy/http_integration_test.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ func TestProxyStripsPath(t *testing.T) {
213213
Transport: http.DefaultTransport,
214214
Lookup: func(r *http.Request) *route.Target {
215215
tbl, _ := route.NewTable(bytes.NewBufferString("route add mock /foo/bar " + server.URL + ` opts "strip=/foo"`))
216-
return tbl.Lookup(r, "", route.Picker["rr"], route.Matcher["prefix"], globCache, globEnabled)
216+
return tbl.Lookup(r, route.Picker["rr"], route.Matcher["prefix"], globCache, globEnabled)
217217
},
218218
})
219219
defer proxy.Close()
@@ -241,7 +241,7 @@ func TestProxyPrependsPath(t *testing.T) {
241241
Transport: http.DefaultTransport,
242242
Lookup: func(r *http.Request) *route.Target {
243243
tbl, _ := route.NewTable(bytes.NewBufferString("route add mock /bar " + server.URL + ` opts "prepend=/foo"`))
244-
return tbl.Lookup(r, "", route.Picker["rr"], route.Matcher["prefix"], globCache, globEnabled)
244+
return tbl.Lookup(r, route.Picker["rr"], route.Matcher["prefix"], globCache, globEnabled)
245245
},
246246
})
247247
defer proxy.Close()
@@ -277,7 +277,7 @@ func TestProxyHost(t *testing.T) {
277277
},
278278
},
279279
Lookup: func(r *http.Request) *route.Target {
280-
return tbl.Lookup(r, "", route.Picker["rr"], route.Matcher["prefix"], globCache, globEnabled)
280+
return tbl.Lookup(r, route.Picker["rr"], route.Matcher["prefix"], globCache, globEnabled)
281281
},
282282
})
283283
defer proxy.Close()
@@ -324,7 +324,7 @@ func TestHostRedirect(t *testing.T) {
324324
Transport: http.DefaultTransport,
325325
Lookup: func(r *http.Request) *route.Target {
326326
r.Host = "c.com"
327-
return tbl.Lookup(r, "", route.Picker["rr"], route.Matcher["prefix"], globCache, globEnabled)
327+
return tbl.Lookup(r, route.Picker["rr"], route.Matcher["prefix"], globCache, globEnabled)
328328
},
329329
})
330330
defer proxy.Close()
@@ -363,7 +363,7 @@ func TestPathRedirect(t *testing.T) {
363363
proxy := httptest.NewServer(&HTTPProxy{
364364
Transport: http.DefaultTransport,
365365
Lookup: func(r *http.Request) *route.Target {
366-
return tbl.Lookup(r, "", route.Picker["rr"], route.Matcher["prefix"], globCache, globEnabled)
366+
return tbl.Lookup(r, route.Picker["rr"], route.Matcher["prefix"], globCache, globEnabled)
367367
},
368368
})
369369
defer proxy.Close()
@@ -531,7 +531,7 @@ func TestProxyHTTPSUpstream(t *testing.T) {
531531
Transport: &http.Transport{TLSClientConfig: tlsClientConfig()},
532532
Lookup: func(r *http.Request) *route.Target {
533533
tbl, _ := route.NewTable(bytes.NewBufferString("route add srv / " + server.URL + ` opts "proto=https"`))
534-
return tbl.Lookup(r, "", route.Picker["rr"], route.Matcher["prefix"], globCache, globEnabled)
534+
return tbl.Lookup(r, route.Picker["rr"], route.Matcher["prefix"], globCache, globEnabled)
535535
},
536536
})
537537
defer proxy.Close()
@@ -569,7 +569,7 @@ func TestProxyHTTPSTransport(t *testing.T) {
569569
Transport: &http.Transport{TLSClientConfig: tlsClientConfig()},
570570
Lookup: func(r *http.Request) *route.Target {
571571
tbl, _ := route.NewTable(bytes.NewBufferString("route add srv / " + server.URL + ` opts "proto=https host=foo.com tlsskipverify=true"`))
572-
return tbl.Lookup(r, "", route.Picker["rr"], route.Matcher["prefix"], globCache, globEnabled)
572+
return tbl.Lookup(r, route.Picker["rr"], route.Matcher["prefix"], globCache, globEnabled)
573573
},
574574
})
575575
defer proxy.Close()
@@ -600,7 +600,7 @@ func TestProxyHTTPSUpstreamSkipVerify(t *testing.T) {
600600
},
601601
Lookup: func(r *http.Request) *route.Target {
602602
tbl, _ := route.NewTable(bytes.NewBufferString("route add srv / " + server.URL + ` opts "proto=https tlsskipverify=true"`))
603-
return tbl.Lookup(r, "", route.Picker["rr"], route.Matcher["prefix"], globCache, globEnabled)
603+
return tbl.Lookup(r, route.Picker["rr"], route.Matcher["prefix"], globCache, globEnabled)
604604
},
605605
})
606606
defer proxy.Close()
@@ -812,7 +812,7 @@ func BenchmarkProxyLogger(b *testing.B) {
812812
Transport: http.DefaultTransport,
813813
Lookup: func(r *http.Request) *route.Target {
814814
tbl, _ := route.NewTable(bytes.NewBufferString("route add mock / " + server.URL))
815-
return tbl.Lookup(r, "", route.Picker["rr"], route.Matcher["prefix"], globCache, globEnabled)
815+
return tbl.Lookup(r, route.Picker["rr"], route.Matcher["prefix"], globCache, globEnabled)
816816
},
817817
Logger: l,
818818
}

‎proxy/inetaf_tcpproxy_integration_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ route add tcproute example2.com/ tcp://%s opts "proto=tcp"`
5050
table, _ := route.NewTable(bytes.NewBufferString(fmt.Sprintf(tpl, httpServer.URL, tcpServer.Listener.Addr())))
5151
hp := &HTTPProxy{
5252
Lookup: func(r *http.Request) *route.Target {
53-
return table.Lookup(r, "", route.Picker["rr"], route.Matcher["prefix"], globCache, globEnabled)
53+
return table.Lookup(r, route.Picker["rr"], route.Matcher["prefix"], globCache, globEnabled)
5454
},
5555
}
5656

‎proxy/listen_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func TestGracefulShutdown(t *testing.T) {
3232
Transport: http.DefaultTransport,
3333
Lookup: func(r *http.Request) *route.Target {
3434
tbl, _ := route.NewTable(bytes.NewBufferString("route add svc / " + srv.URL))
35-
return tbl.Lookup(r, "", route.Picker["rr"], route.Matcher["prefix"], globCache, globEnabled)
35+
return tbl.Lookup(r, route.Picker["rr"], route.Matcher["prefix"], globCache, globEnabled)
3636
},
3737
}
3838
l := config.Listen{Addr: addr}

‎proxy/ws_integration_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func TestProxyWSUpstream(t *testing.T) {
4646
InsecureTransport: &http.Transport{TLSClientConfig: tlsInsecureConfig()},
4747
Lookup: func(r *http.Request) *route.Target {
4848
tbl, _ := route.NewTable(bytes.NewBufferString(routes))
49-
return tbl.Lookup(r, "", route.Picker["rr"], route.Matcher["prefix"], globCache, globEnabled)
49+
return tbl.Lookup(r, route.Picker["rr"], route.Matcher["prefix"], globCache, globEnabled)
5050
},
5151
})
5252
defer httpProxy.Close()
@@ -58,7 +58,7 @@ func TestProxyWSUpstream(t *testing.T) {
5858
InsecureTransport: &http.Transport{TLSClientConfig: tlsInsecureConfig()},
5959
Lookup: func(r *http.Request) *route.Target {
6060
tbl, _ := route.NewTable(bytes.NewBufferString(routes))
61-
return tbl.Lookup(r, "", route.Picker["rr"], route.Matcher["prefix"], globCache, globEnabled)
61+
return tbl.Lookup(r, route.Picker["rr"], route.Matcher["prefix"], globCache, globEnabled)
6262
},
6363
})
6464
httpsProxy.TLS = tlsServerConfig()

‎route/issue57_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func TestIssue57(t *testing.T) {
3333
if err != nil {
3434
t.Fatalf("%d: got %v want nil", i, err)
3535
}
36-
target := tbl.Lookup(req, "", rrPicker, prefixMatcher, globCache, globEnabled)
36+
target := tbl.Lookup(req, rrPicker, prefixMatcher, globCache, globEnabled)
3737
if target == nil {
3838
t.Fatalf("%d: got %v want %v", i, target, want)
3939
}

‎route/route_bench_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ func benchmarkGet(t Table, match matcher, pick picker, pb *testing.PB) {
126126
k, n := len(reqs), 0
127127
//Glob Matching True
128128
for pb.Next() {
129-
t.Lookup(reqs[n%k], "", pick, match, globCache, globEnabled)
129+
t.Lookup(reqs[n%k], pick, match, globCache, globEnabled)
130130
n++
131131
}
132132
}

‎route/table.go‎

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -462,15 +462,9 @@ func ReverseHostPort(s string) string {
462462
// or nil if there is none. It first checks the routes for the host
463463
// and if none matches then it falls back to generic routes without
464464
// a host. This is useful for a catch-all '/' rule.
465-
func (t Table) Lookup(req *http.Request, trace string, pick picker, match matcher, globCache *GlobCache, globDisabled bool) (target *Target) {
465+
func (t Table) Lookup(req *http.Request, pick picker, match matcher, globCache *GlobCache, globDisabled bool) (target *Target) {
466466

467467
var hosts []string
468-
if trace != "" {
469-
if len(trace) > 16 {
470-
trace = trace[:15]
471-
}
472-
log.Printf("[TRACE] %s Tracing %s%s", trace, req.Host, req.URL.Path)
473-
}
474468

475469
// find matching hosts for the request
476470
// and add "no host" as the fallback option
@@ -482,12 +476,9 @@ func (t Table) Lookup(req *http.Request, trace string, pick picker, match matche
482476
hosts = t.matchingHosts(req, globCache)
483477
}
484478

485-
if trace != "" {
486-
log.Printf("[TRACE] %s Matching hosts: %v", trace, hosts)
487-
}
488479
hosts = append(hosts, "")
489480
for _, h := range hosts {
490-
if target = t.lookup(h, req.URL.Path, trace, pick, match); target != nil {
481+
if target = t.lookup(h, req.URL.Path, pick, match); target != nil {
491482
if target.RedirectCode != 0 {
492483
req.URL.Host = req.Host
493484
target.BuildRedirectURL(req.URL) // build redirect url and cache in target
@@ -502,18 +493,14 @@ func (t Table) Lookup(req *http.Request, trace string, pick picker, match matche
502493
}
503494
}
504495

505-
if target != nil && trace != "" {
506-
log.Printf("[TRACE] %s Routing to service %s on %s", trace, target.Service, target.URL)
507-
}
508-
509496
return target
510497
}
511498

512499
func (t Table) LookupHost(host string, pick picker) *Target {
513-
return t.lookup(host, "/", "", pick, prefixMatcher)
500+
return t.lookup(host, "/", pick, prefixMatcher)
514501
}
515502

516-
func (t Table) lookup(host, path, trace string, pick picker, match matcher) *Target {
503+
func (t Table) lookup(host, path string, pick picker, match matcher) *Target {
517504
host = strings.ToLower(host) // routes are always added lowercase
518505
for _, r := range t[host] {
519506
if match(path, r) {
@@ -528,14 +515,8 @@ func (t Table) lookup(host, path, trace string, pick picker, match matcher) *Tar
528515
} else {
529516
target = pick(r)
530517
}
531-
if trace != "" {
532-
log.Printf("[TRACE] %s Match %s%s", trace, r.Host, r.Path)
533-
}
534518
return target
535519
}
536-
if trace != "" {
537-
log.Printf("[TRACE] %s No match %s%s", trace, r.Host, r.Path)
538-
}
539520
}
540521
return nil
541522
}

‎route/table_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,7 @@ func TestTableLookupIssue448(t *testing.T) {
563563
}
564564

565565
for i, tt := range tests {
566-
if got, want := tbl.Lookup(tt.req, "", rndPicker, prefixMatcher, globCache, globEnabled).URL.String(), tt.dst; got != want {
566+
if got, want := tbl.Lookup(tt.req, rndPicker, prefixMatcher, globCache, globEnabled).URL.String(), tt.dst; got != want {
567567
t.Errorf("%d: got %v want %v", i, got, want)
568568
}
569569
}
@@ -639,7 +639,7 @@ func TestTableLookup(t *testing.T) {
639639
}
640640

641641
for i, tt := range tests {
642-
if got, want := tbl.Lookup(tt.req, "", rndPicker, prefixMatcher, globCache, globEnabled).URL.String(), tt.dst; got != want {
642+
if got, want := tbl.Lookup(tt.req, rndPicker, prefixMatcher, globCache, globEnabled).URL.String(), tt.dst; got != want {
643643
t.Errorf("%d: got %v want %v", i, got, want)
644644
}
645645
}
@@ -658,7 +658,7 @@ func TestTableLookup_656(t *testing.T) {
658658
}
659659

660660
req := httptest.NewRequest("GET", "http://example.com/foo", nil)
661-
target := tbl.Lookup(req, "", rrPicker, prefixMatcher, globCache, globDisabled)
661+
target := tbl.Lookup(req, rrPicker, prefixMatcher, globCache, globDisabled)
662662

663663
if target == nil {
664664
t.Fatal("No route match")

0 commit comments

Comments
 (0)