From ae062a0825a4100d0cf9ac7c8bb0fa1ca69c6814 Mon Sep 17 00:00:00 2001 From: Brian Waldon Date: Thu, 29 Jan 2015 16:12:34 -0800 Subject: [PATCH] client: move lock so MembersAPI.List doesn't deadlock --- client/client.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/client.go b/client/client.go index 7ddcd845d..53bb8cad9 100644 --- a/client/client.go +++ b/client/client.go @@ -223,15 +223,15 @@ func (c *httpClusterClient) Endpoints() []string { } func (c *httpClusterClient) Sync(ctx context.Context) error { - c.Lock() - defer c.Unlock() - mAPI := NewMembersAPI(c) ms, err := mAPI.List(ctx) if err != nil { return err } + c.Lock() + defer c.Unlock() + eps := make([]string, 0) for _, m := range ms { eps = append(eps, m.ClientURLs...)