Skip to content

Commit

Permalink
Combine paths with and without trailing slash
Browse files Browse the repository at this point in the history
Closes #269
Signed-off-by: Lukas Kämmerling <[email protected]>
  • Loading branch information
LKaemmerling committed May 2, 2022
1 parent 9154926 commit b05e27d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/api/collect.go
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ func shouldCollect(r *http.Request) bool {
}

func parsePathname(p string) string {
return "/" + strings.TrimLeft(p, "/")
return "/" + strings.TrimLeft(strings.TrimRight(p, "/"), "/")
}

func parseHostname(r string) string {
Expand Down
3 changes: 3 additions & 0 deletions pkg/api/collect_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ func TestParsePathname(t *testing.T) {
if v := parsePathname("about"); v != "/about" {
t.Errorf("error parsing pathname. expected %#v, got %#v", "/about", v)
}
if v := parsePathname("about/"); v != "/about" {
t.Errorf("error parsing pathname. expected %#v, got %#v", "/about", v)
}
}

func TestParseHostname(t *testing.T) {
Expand Down

0 comments on commit b05e27d

Please sign in to comment.