diff options
author | Christopher Speller <crspeller@gmail.com> | 2018-06-21 13:10:40 -0700 |
---|---|---|
committer | Harrison Healey <harrisonmhealey@gmail.com> | 2018-06-21 16:10:40 -0400 |
commit | 8526739066ccb00ccd24b74650a7d7b284442985 (patch) | |
tree | 282512ae2ad95c98a9ca82de304a410b6b56685c /vendor/github.com/go-redis/redis/redis.go | |
parent | a59ccaa8b3844895dde3980e6224fef46ff4a1c8 (diff) | |
download | chat-8526739066ccb00ccd24b74650a7d7b284442985.tar.gz chat-8526739066ccb00ccd24b74650a7d7b284442985.tar.bz2 chat-8526739066ccb00ccd24b74650a7d7b284442985.zip |
MM-10934 Update server dependencies. (#8981)
* Changing throttled import path.
* Upgrading dependencies.
Diffstat (limited to 'vendor/github.com/go-redis/redis/redis.go')
-rw-r--r-- | vendor/github.com/go-redis/redis/redis.go | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/vendor/github.com/go-redis/redis/redis.go b/vendor/github.com/go-redis/redis/redis.go index 7a606b70e..beb632e1e 100644 --- a/vendor/github.com/go-redis/redis/redis.go +++ b/vendor/github.com/go-redis/redis/redis.go @@ -60,29 +60,30 @@ func (c *baseClient) newConn() (*pool.Conn, error) { return cn, nil } -func (c *baseClient) getConn() (*pool.Conn, bool, error) { - cn, isNew, err := c.connPool.Get() +func (c *baseClient) getConn() (*pool.Conn, error) { + cn, err := c.connPool.Get() if err != nil { - return nil, false, err + return nil, err } if !cn.Inited { - if err := c.initConn(cn); err != nil { - _ = c.connPool.Remove(cn) - return nil, false, err + err := c.initConn(cn) + if err != nil { + c.connPool.Remove(cn) + return nil, err } } - return cn, isNew, nil + return cn, nil } func (c *baseClient) releaseConn(cn *pool.Conn, err error) bool { if internal.IsBadConn(err, false) { - _ = c.connPool.Remove(cn) + c.connPool.Remove(cn) return false } - _ = c.connPool.Put(cn) + c.connPool.Put(cn) return true } @@ -137,7 +138,7 @@ func (c *baseClient) defaultProcess(cmd Cmder) error { time.Sleep(c.retryBackoff(attempt)) } - cn, _, err := c.getConn() + cn, err := c.getConn() if err != nil { cmd.setErr(err) if internal.IsRetryableError(err, true) { @@ -225,7 +226,7 @@ func (c *baseClient) generalProcessPipeline(cmds []Cmder, p pipelineProcessor) e time.Sleep(c.retryBackoff(attempt)) } - cn, _, err := c.getConn() + cn, err := c.getConn() if err != nil { setCmdsErr(cmds, err) return err @@ -234,10 +235,10 @@ func (c *baseClient) generalProcessPipeline(cmds []Cmder, p pipelineProcessor) e canRetry, err := p(cn, cmds) if err == nil || internal.IsRedisError(err) { - _ = c.connPool.Put(cn) + c.connPool.Put(cn) break } - _ = c.connPool.Remove(cn) + c.connPool.Remove(cn) if !canRetry || !internal.IsRetryableError(err, true) { break |