From b784ced5175d77d2ce17657f71ebb3858f4dafda Mon Sep 17 00:00:00 2001 From: Ben Johnson Date: Wed, 4 Dec 2013 22:39:59 -0700 Subject: [PATCH] Update mod/lock versioning. --- mod/lock/v2/tests/handler_test.go | 8 ++++---- mod/mod.go | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mod/lock/v2/tests/handler_test.go b/mod/lock/v2/tests/handler_test.go index b589865bf57..b07572bbe43 100644 --- a/mod/lock/v2/tests/handler_test.go +++ b/mod/lock/v2/tests/handler_test.go @@ -164,25 +164,25 @@ func TestModLockRenew(t *testing.T) { func testAcquireLock(s *server.Server, key string, ttl int) (string, error) { - resp, err := tests.PostForm(fmt.Sprintf("%s/mod/lock/v2/%s?ttl=%d", s.URL(), key, ttl), nil) + resp, err := tests.PostForm(fmt.Sprintf("%s/mod/v2/lock/%s?ttl=%d", s.URL(), key, ttl), nil) ret := tests.ReadBody(resp) return string(ret), err } func testGetLockIndex(s *server.Server, key string) (string, error) { - resp, err := tests.Get(fmt.Sprintf("%s/mod/lock/v2/%s", s.URL(), key)) + resp, err := tests.Get(fmt.Sprintf("%s/mod/v2/lock/%s", s.URL(), key)) ret := tests.ReadBody(resp) return string(ret), err } func testReleaseLock(s *server.Server, key string, index int) (string, error) { - resp, err := tests.DeleteForm(fmt.Sprintf("%s/mod/lock/v2/%s/%d", s.URL(), key, index), nil) + resp, err := tests.DeleteForm(fmt.Sprintf("%s/mod/v2/lock/%s/%d", s.URL(), key, index), nil) ret := tests.ReadBody(resp) return string(ret), err } func testRenewLock(s *server.Server, key string, index int, ttl int) (string, error) { - resp, err := tests.PutForm(fmt.Sprintf("%s/mod/lock/v2/%s/%d?ttl=%d", s.URL(), key, index, ttl), nil) + resp, err := tests.PutForm(fmt.Sprintf("%s/mod/v2/lock/%s/%d?ttl=%d", s.URL(), key, index, ttl), nil) ret := tests.ReadBody(resp) return string(ret), err } diff --git a/mod/mod.go b/mod/mod.go index b5625db3f63..34a380689f8 100644 --- a/mod/mod.go +++ b/mod/mod.go @@ -23,6 +23,6 @@ func HttpHandler(addr string) http.Handler { r.PathPrefix("/dashboard/").Handler(http.StripPrefix("/dashboard/", dashboard.HttpHandler())) // TODO: Use correct addr. - r.PathPrefix("/lock/v2").Handler(http.StripPrefix("/lock/v2", lock2.NewHandler(addr))) + r.PathPrefix("/v2/lock").Handler(http.StripPrefix("/v2/lock", lock2.NewHandler(addr))) return r }