Merge pull request #348 from usefathom/compine-paths

Combine paths with and without trailing slash
usefathom · May 2, 2022 · 7a234a8 · 7a234a8
2 parents 9154926 + b05e27d
commit 7a234a8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/pkg/api/collect.go b/pkg/api/collect.go
@@ -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 {

diff --git a/pkg/api/collect_test.go b/pkg/api/collect_test.go
@@ -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) {