From bad3b6bde319cae9910d40c1424b57dfd4fd317e Mon Sep 17 00:00:00 2001 From: ale <ale@incal.net> Date: Fri, 16 Nov 2018 10:00:31 +0000 Subject: [PATCH] Upgrade go-common --- .../ai3/go-common/clientutil/balancer.go | 5 ++++- vendor/vendor.json | 14 +++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/vendor/git.autistici.org/ai3/go-common/clientutil/balancer.go b/vendor/git.autistici.org/ai3/go-common/clientutil/balancer.go index 9d9b7dd..f53b68e 100644 --- a/vendor/git.autistici.org/ai3/go-common/clientutil/balancer.go +++ b/vendor/git.autistici.org/ai3/go-common/clientutil/balancer.go @@ -104,7 +104,10 @@ func (b *balancedBackend) Call(ctx context.Context, shard, path string, req, res } var tg targetGenerator = b.backendTracker - if b.sharded && shard != "" { + if b.sharded { + if shard == "" { + return fmt.Errorf("call without shard to sharded service %s", b.baseURI.String()) + } tg = newShardedGenerator(shard, b.baseURI.Host, b.resolver) } seq := newSequence(tg) diff --git a/vendor/vendor.json b/vendor/vendor.json index d199922..cb04a61 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -5,20 +5,20 @@ { "checksumSHA1": "pLvPnUablirQucyALgrso9hLG4E=", "path": "git.autistici.org/ai3/go-common", - "revision": "6916834dec86e761a3091c9628cbff9b6c389867", - "revisionTime": "2018-10-29T11:03:54Z" + "revision": "2fd6e256a27812c8dab4cce19b756213ce8c69bf", + "revisionTime": "2018-11-16T09:25:50Z" }, { - "checksumSHA1": "Xd4ClmFykFMOg8b2ZFXimSS3Uj0=", + "checksumSHA1": "HtRAXnw4/i/jVoa5d3arp34Uerw=", "path": "git.autistici.org/ai3/go-common/clientutil", - "revision": "6916834dec86e761a3091c9628cbff9b6c389867", - "revisionTime": "2018-10-29T11:03:54Z" + "revision": "2fd6e256a27812c8dab4cce19b756213ce8c69bf", + "revisionTime": "2018-11-16T09:25:50Z" }, { "checksumSHA1": "RyFydcBJvLBevfsriijLqHtZ0hs=", "path": "git.autistici.org/ai3/go-common/serverutil", - "revision": "6916834dec86e761a3091c9628cbff9b6c389867", - "revisionTime": "2018-10-29T11:03:54Z" + "revision": "2fd6e256a27812c8dab4cce19b756213ce8c69bf", + "revisionTime": "2018-11-16T09:25:50Z" }, { "checksumSHA1": "rcWTaHvwTmKqbl8NqUF/nDsHzk8=", -- GitLab